Extracted groups into their own components