Updated database definitions 2