add fielddata collection back.