More WIP Model refactoring