Add capability for regex subgroup matching