Finish refactor for MTLModel