I don't think RESERVED_FIELDS is needed anymore.