Prep the field class for refactoring