Added multiword hedge support