Updated DBService