Refactor model additions, content bug fixes