Updated to mostly Logical Data Model