Re-added JIP groups

We can close #176 now ;)