Add DataModel
Move DB service