Rework to use consonance lists