DI violation in Db class fix