Add @todo to remove fields of unsupported type