Further streamlining FieldManager code