New Schema and Model updates