More shop related integration updates

More shop related integration updates