added group parsing