Extended CP groups by option to define own wrapper