Updated database file. Updated tables and keys