Refactored field