Refactored temp fields