Better rhyme annotation