1> Updated DB model
2> Added view model