Add support for grouplayers 2