Refactor model fields to array