Added changes for Default Group and Shop

Added changes for Default Group and Shop