Database

Refactoring the Query interface as a single class that is domain
agnostic and portable.