Updated database to handle new tables and fields