Revert "Revert "Add Data Model""

This reverts commit 51917e4cf21adec8538507d2ea1d44e1c937eb0c.