Added HikaShop Over-ride support