Add shared Group support