Small Schema Field Refactoring.