Data Model

Updated the tables