Refactored Data Model.