Update model to meet the [new design](https://www.lucidchart.com/documents/edit/42736c71-b2dd-474b-9cba-dcf7c0559783/uR~JkchVdQXz?beaconFlowId=B8E1D76AAD71623C) and refactor it to use new DAL #50 .
