LPS-46797 Add group id mapping