edited DBModel

*now DBModel matches new DB