updated schema with match model