Replace base class references with base class queries