Complete refactoring of common models