Made a small change so we can inject our own custom mappers into the DbQuery for performance optimizations.