Model structure refactor.