refactored fields support