Refactoring custom fields in progress.