Add support for grouplayers