Updated database script and new data model entities