Changed queries to implement an interface rather than inheriting from a base class that provides no default functionality.