Removed MUST_HAVE_FIELDS