Finishing the Data Model