Fix schema passing when multiple stores