Updated database structure a lot