Complete refactoring of the Engine model