Final store-specific changes implemented