Continued refactor for backbone models