Changed the GroupId and some other related stuff.