Moved temporary model into views