Add basic group layer support - maybe?