Updated Database Models and a few other stuff