[TASK] Switch Custom field to FormComponent