Re-factored Fields collection.