added the support for mapping between names and groups