Added db and cache classes