[TASK] Add BaseForm property to field