Issue #137: DB Resolver optimization