Minor changes to existing models. Changed names of properties and started implementing constraints with attributes