Added waltz and quadrille tags