Great changes on Model and Controller.DB classes