Refactor model schema