Made changes to reflect new database changes