[Naval/Andrew] Adding the group mapping model