Add missing query fields.
Add transaction abstraction.