Fix group schema