Add migration for the new group management
Use migration properly
Use migration properly