Updated database schema to be more realistic