Adjust our core Data Model