Updated DBModel