Updated database design
Fixed merge conflict