Friend Gateway updated to work with Friend Mapper (added)