Updated database definitions