add '_fields' partial for refactoring