techdebt/389/fieldRefactor