Adding auto group creation