Added group and groupjoin tables