Updated Database and Controllers