Added multiword support.