Adding group category support and fixing deletion and creation of membership data