Added bidrectional group mapping support