Updated database relationships