Changes related to different store types