Support for local aliases
Support regrouped entries
Refactor remaining models, remove legacy code