Updated schema with latest migrations