Replaced entity data model and renewed Add views. Need to replace Edit views.*