Added name annotation support for groups