fixup! Add layergroup support