Updated Database to work with model changes