Added db interaction as well as services