Added multistore compatibility