Added waltz mappings