Moved DataQuery.
Added hook/event subscribing, for simpler extensibility and greater code independence.