Finalize refactoring the front-end models