[PB] {refactoring} Adapted gmap fragment to new generic data structure