Added db infrastructure code