Added validation to view entity
Changed entities to use auto updating