Martin K and I have ported all of ContactsModel to the new enums. With a _lot_ of fixes. Model refactor 3 is up-to-date in both branches. Sorting is broken after an "optimisation" Martin K did. Once that is fixed, consider the branches "ready for review". Plasmoids are not tested, but the declarative plugin does compile. David