Updated database schema and model classes