Support for groups added in Parser