Move group creation from egielda to common