Moving Database class to be abstract.  Then the query classes can be instantiated and utilize the database class only when needed.