make multi-store compatible