From f1d68aa7f63357b394945f85143244461fb9249b Mon Sep 17 00:00:00 2001
From: Eugen Betke <eugen.betke@ecmwf.int>
Date: Mon, 18 Mar 2024 22:41:56 +0000
Subject: [PATCH] 18% tests passed, 276 tests failed out of 337

---
 examples/C/grib_pthreads.c                    |   2 +-
 src/CMakeLists.txt                            | 391 +++++-----
 ...rib_accessor_class_abstract_long_vector.cc |  17 +
 ...grib_accessor_class_abstract_long_vector.h |  33 +
 .../grib_accessor_class_abstract_vector.cc    |  17 +
 .../grib_accessor_class_abstract_vector.h     |  32 +
 src/accessor/grib_accessor_class_ascii.cc     | 164 +++++
 src/accessor/grib_accessor_class_ascii.h      |  42 ++
 src/accessor/grib_accessor_class_bit.cc       |  79 ++
 src/accessor/grib_accessor_class_bit.h        |  35 +
 src/accessor/grib_accessor_class_bitmap.cc    | 175 +++++
 src/accessor/grib_accessor_class_bitmap.h     |  45 ++
 .../{todo => }/grib_accessor_class_bits.cc    | 170 +----
 src/accessor/grib_accessor_class_bits.h       |  45 ++
 .../grib_accessor_class_bits_per_value.cc     |  73 ++
 .../grib_accessor_class_bits_per_value.h      |  35 +
 src/accessor/grib_accessor_class_blob.cc      |  42 ++
 src/accessor/grib_accessor_class_blob.h       |  34 +
 src/accessor/grib_accessor_class_budgdate.cc  |  82 +++
 src/accessor/grib_accessor_class_budgdate.h   |  36 +
 .../grib_accessor_class_bufr_data_array.cc    | 530 ++++----------
 .../grib_accessor_class_bufr_data_array.h     |  93 +++
 .../grib_accessor_class_bufr_data_element.cc  | 254 ++-----
 .../grib_accessor_class_bufr_data_element.h   |  56 ++
 ...grib_accessor_class_bufr_elements_table.cc | 137 +---
 .../grib_accessor_class_bufr_elements_table.h |  39 +
 ...ccessor_class_bufr_extract_area_subsets.cc | 128 +---
 ...accessor_class_bufr_extract_area_subsets.h |  43 ++
 ...sor_class_bufr_extract_datetime_subsets.cc | 114 +--
 ...ssor_class_bufr_extract_datetime_subsets.h |  36 +
 ...rib_accessor_class_bufr_extract_subsets.cc |  58 ++
 ...grib_accessor_class_bufr_extract_subsets.h |  37 +
 .../grib_accessor_class_bufr_group.cc         |  39 +
 src/accessor/grib_accessor_class_bufr_group.h |  31 +
 ...rib_accessor_class_bufr_simple_thinning.cc | 114 +++
 ...grib_accessor_class_bufr_simple_thinning.h |  39 +
 .../grib_accessor_class_bufr_string_values.cc |  84 +++
 .../grib_accessor_class_bufr_string_values.h  |  38 +
 ...essor_class_bufrdc_expanded_descriptors.cc |  98 +++
 ...cessor_class_bufrdc_expanded_descriptors.h |  37 +
 src/accessor/grib_accessor_class_bytes.cc     |  99 +++
 src/accessor/grib_accessor_class_bytes.h      |  35 +
 ...r_class_change_alternative_row_scanning.cc | 117 +++
 ...or_class_change_alternative_row_scanning.h |  38 +
 ...ccessor_class_change_scanning_direction.cc | 121 +---
 ...accessor_class_change_scanning_direction.h |  42 ++
 ...b_accessor_class_check_internal_version.cc |  51 ++
 ...ib_accessor_class_check_internal_version.h |  33 +
 .../grib_accessor_class_closest_date.cc       | 126 +---
 .../grib_accessor_class_closest_date.h        |  43 ++
 src/accessor/grib_accessor_class_codeflag.cc  | 119 +++
 src/accessor/grib_accessor_class_codeflag.h   |  34 +
 .../grib_accessor_class_codetable_title.cc    |  69 ++
 .../grib_accessor_class_codetable_title.h     |  34 +
 .../grib_accessor_class_codetable_units.cc    |  70 ++
 .../grib_accessor_class_codetable_units.h     |  34 +
 .../{todo => }/grib_accessor_class_concept.cc | 186 +----
 src/accessor/grib_accessor_class_concept.h    |  43 ++
 .../grib_accessor_class_count_file.cc         |  28 +
 src/accessor/grib_accessor_class_count_file.h |  32 +
 .../grib_accessor_class_count_missing.cc      | 117 +--
 .../grib_accessor_class_count_missing.h       |  37 +
 .../grib_accessor_class_count_total.cc        |  28 +
 .../grib_accessor_class_count_total.h         |  32 +
 .../grib_accessor_class_data_apply_bitmap.cc  | 179 +----
 .../grib_accessor_class_data_apply_bitmap.h   |  46 ++
 ...cessor_class_data_apply_boustrophedonic.cc | 145 +---
 ...ccessor_class_data_apply_boustrophedonic.h |  44 ++
 ...class_data_apply_boustrophedonic_bitmap.cc | 157 +---
 ..._class_data_apply_boustrophedonic_bitmap.h |  45 ++
 .../grib_accessor_class_data_ccsds_packing.cc | 195 +----
 .../grib_accessor_class_data_ccsds_packing.h  |  47 ++
 ...rib_accessor_class_data_complex_packing.cc | 173 +----
 ...grib_accessor_class_data_complex_packing.h |  45 ++
 .../grib_accessor_class_data_dummy_field.cc   | 102 +++
 .../grib_accessor_class_data_dummy_field.h    |  37 +
 ...b_accessor_class_data_g1complex_packing.cc | 112 +++
 ...ib_accessor_class_data_g1complex_packing.h |  37 +
 ...a_g1second_order_constant_width_packing.cc | 177 +----
 ...ta_g1second_order_constant_width_packing.h |  53 ++
 ...g1second_order_general_extended_packing.cc | 220 +-----
 ..._g1second_order_general_extended_packing.h |  65 ++
 ...ass_data_g1second_order_general_packing.cc | 173 +----
 ...lass_data_g1second_order_general_packing.h |  51 ++
 ..._data_g1second_order_row_by_row_packing.cc | 171 +----
 ...s_data_g1second_order_row_by_row_packing.h |  51 ++
 ..._accessor_class_data_g1secondary_bitmap.cc | 128 ++++
 ...b_accessor_class_data_g1secondary_bitmap.h |  34 +
 ..._accessor_class_data_g1shsimple_packing.cc |  64 ++
 ...b_accessor_class_data_g1shsimple_packing.h |  32 +
 ...ib_accessor_class_data_g1simple_packing.cc | 136 +---
 ...rib_accessor_class_data_g1simple_packing.h |  37 +
 ...ib_accessor_class_data_g22order_packing.cc | 227 +-----
 ...rib_accessor_class_data_g22order_packing.h |  57 ++
 ...accessor_class_data_g2bifourier_packing.cc | 193 +----
 ..._accessor_class_data_g2bifourier_packing.h |  47 ++
 ...b_accessor_class_data_g2complex_packing.cc |  47 ++
 ...ib_accessor_class_data_g2complex_packing.h |  34 +
 ..._accessor_class_data_g2secondary_bitmap.cc | 107 +++
 ...b_accessor_class_data_g2secondary_bitmap.h |  34 +
 ..._accessor_class_data_g2shsimple_packing.cc |  92 +++
 ...b_accessor_class_data_g2shsimple_packing.h |  36 +
 ...ib_accessor_class_data_g2simple_packing.cc | 157 +---
 ...rib_accessor_class_data_g2simple_packing.h |  34 +
 ...ata_g2simple_packing_with_preprocessing.cc | 179 +++++
 ...data_g2simple_packing_with_preprocessing.h |  36 +
 ...ib_accessor_class_data_jpeg2000_packing.cc | 185 +----
 ...rib_accessor_class_data_jpeg2000_packing.h |  46 ++
 .../grib_accessor_class_data_png_packing.cc   | 191 +----
 .../grib_accessor_class_data_png_packing.h    |  46 ++
 .../grib_accessor_class_data_raw_packing.cc   | 194 +++++
 .../grib_accessor_class_data_raw_packing.h    |  38 +
 ..._accessor_class_data_run_length_packing.cc | 134 +---
 ...b_accessor_class_data_run_length_packing.h |  40 ++
 ...ib_accessor_class_data_secondary_bitmap.cc | 118 +++
 ...rib_accessor_class_data_secondary_bitmap.h |  38 +
 .../grib_accessor_class_data_sh_packed.cc     | 147 +---
 .../grib_accessor_class_data_sh_packed.h      |  43 ++
 .../grib_accessor_class_data_sh_unpacked.cc   | 147 +---
 .../grib_accessor_class_data_sh_unpacked.h    |  43 ++
 ...ib_accessor_class_data_shsimple_packing.cc |  60 ++
 ...rib_accessor_class_data_shsimple_packing.h |  37 +
 ...grib_accessor_class_data_simple_packing.cc | 186 +----
 .../grib_accessor_class_data_simple_packing.h |  48 ++
 .../grib_accessor_class_decimal_precision.cc  | 103 +++
 .../grib_accessor_class_decimal_precision.h   |  37 +
 .../grib_accessor_class_dictionary.cc         | 129 +---
 src/accessor/grib_accessor_class_dictionary.h |  42 ++
 src/accessor/grib_accessor_class_dirty.cc     |  47 ++
 src/accessor/grib_accessor_class_dirty.h      |  34 +
 src/accessor/grib_accessor_class_divdouble.cc |  43 ++
 src/accessor/grib_accessor_class_divdouble.h  |  34 +
 src/accessor/grib_accessor_class_double.cc    | 105 +++
 src/accessor/grib_accessor_class_double.h     |  35 +
 .../{todo => }/grib_accessor_class_element.cc | 117 +--
 src/accessor/grib_accessor_class_element.h    |  36 +
 src/accessor/grib_accessor_class_evaluate.cc  |  33 +
 src/accessor/grib_accessor_class_evaluate.h   |  33 +
 ...rib_accessor_class_expanded_descriptors.cc | 200 +-----
 ...grib_accessor_class_expanded_descriptors.h |  47 ++
 ...or_class_from_scale_factor_scaled_value.cc | 125 +---
 ...sor_class_from_scale_factor_scaled_value.h |  37 +
 ...ib_accessor_class_g1_half_byte_codeflag.cc |  60 ++
 ...rib_accessor_class_g1_half_byte_codeflag.h |  35 +
 .../grib_accessor_class_g1_message_length.cc  | 110 +--
 .../grib_accessor_class_g1_message_length.h   |  34 +
 .../grib_accessor_class_g1_section4_length.cc |  53 ++
 .../grib_accessor_class_g1_section4_length.h  |  34 +
 src/accessor/grib_accessor_class_g1bitmap.cc  |  98 +++
 src/accessor/grib_accessor_class_g1bitmap.h   |  35 +
 .../{todo => }/grib_accessor_class_g1date.cc  | 124 +---
 src/accessor/grib_accessor_class_g1date.h     |  39 +
 ...b_accessor_class_g1day_of_the_year_date.cc |  60 ++
 ...ib_accessor_class_g1day_of_the_year_date.h |  33 +
 ...ccessor_class_g1end_of_interval_monthly.cc | 135 ++++
 ...accessor_class_g1end_of_interval_monthly.h |  36 +
 .../grib_accessor_class_g1fcperiod.cc         |  42 ++
 src/accessor/grib_accessor_class_g1fcperiod.h |  31 +
 .../grib_accessor_class_g1forecastmonth.cc    | 129 +---
 .../grib_accessor_class_g1forecastmonth.h     |  40 ++
 .../grib_accessor_class_g1monthlydate.cc      |  41 ++
 .../grib_accessor_class_g1monthlydate.h       |  33 +
 ...ass_g1number_of_coded_values_sh_complex.cc |  81 +++
 ...lass_g1number_of_coded_values_sh_complex.h |  40 ++
 ...lass_g1number_of_coded_values_sh_simple.cc |  62 ++
 ...class_g1number_of_coded_values_sh_simple.h |  37 +
 .../grib_accessor_class_g1step_range.cc       | 164 +----
 .../grib_accessor_class_g1step_range.h        |  48 ++
 .../grib_accessor_class_g1verificationdate.cc |  64 ++
 .../grib_accessor_class_g1verificationdate.h  |  35 +
 .../grib_accessor_class_g2_aerosol.cc         | 114 +++
 src/accessor/grib_accessor_class_g2_aerosol.h |  37 +
 .../grib_accessor_class_g2_chemical.cc        | 116 +--
 .../grib_accessor_class_g2_chemical.h         |  37 +
 .../{todo => }/grib_accessor_class_g2_eps.cc  | 121 +---
 src/accessor/grib_accessor_class_g2_eps.h     |  39 +
 .../grib_accessor_class_g2_mars_labeling.cc   | 159 +----
 .../grib_accessor_class_g2_mars_labeling.h    |  47 ++
 src/accessor/grib_accessor_class_g2bitmap.cc  |  75 ++
 src/accessor/grib_accessor_class_g2bitmap.h   |  34 +
 .../grib_accessor_class_g2bitmap_present.cc   |  59 ++
 .../grib_accessor_class_g2bitmap_present.h    |  34 +
 src/accessor/grib_accessor_class_g2date.cc    |  82 +++
 src/accessor/grib_accessor_class_g2date.h     |  37 +
 .../grib_accessor_class_g2end_step.cc         | 207 +-----
 src/accessor/grib_accessor_class_g2end_step.h |  56 ++
 .../{todo => }/grib_accessor_class_g2grid.cc  | 136 +---
 src/accessor/grib_accessor_class_g2grid.h     |  42 ++
 src/accessor/grib_accessor_class_g2latlon.cc  | 115 +++
 src/accessor/grib_accessor_class_g2latlon.h   |  38 +
 .../{todo => }/grib_accessor_class_g2level.cc | 134 +---
 src/accessor/grib_accessor_class_g2level.h    |  40 ++
 src/accessor/grib_accessor_class_g2lon.cc     |  58 ++
 src/accessor/grib_accessor_class_g2lon.h      |  34 +
 .../grib_accessor_class_g2step_range.cc       | 143 +---
 .../grib_accessor_class_g2step_range.h        |  41 ++
 .../grib_accessor_class_gaussian_grid_name.cc |  84 +++
 .../grib_accessor_class_gaussian_grid_name.h  |  37 +
 .../grib_accessor_class_gds_is_present.cc     |  86 +++
 .../grib_accessor_class_gds_is_present.h      |  37 +
 ...b_accessor_class_gds_not_present_bitmap.cc | 109 +++
 ...ib_accessor_class_gds_not_present_bitmap.h |  40 ++
 src/accessor/grib_accessor_class_getenv.cc    |  62 ++
 src/accessor/grib_accessor_class_getenv.h     |  38 +
 .../grib_accessor_class_global_gaussian.cc    | 126 +---
 .../grib_accessor_class_global_gaussian.h     |  44 ++
 src/accessor/grib_accessor_class_group.cc     | 160 +++++
 src/accessor/grib_accessor_class_group.h      |  41 ++
 .../grib_accessor_class_gts_header.cc         |  61 ++
 src/accessor/grib_accessor_class_gts_header.h |  36 +
 .../grib_accessor_class_hash_array.cc         | 176 +++++
 src/accessor/grib_accessor_class_hash_array.h |  45 ++
 .../grib_accessor_class_headers_only.cc       |  33 +
 .../grib_accessor_class_headers_only.h        |  33 +
 src/accessor/grib_accessor_class_ibmfloat.cc  | 150 ++++
 src/accessor/grib_accessor_class_ibmfloat.h   |  40 ++
 src/accessor/grib_accessor_class_ieeefloat.cc | 123 ++++
 src/accessor/grib_accessor_class_ieeefloat.h  |  37 +
 src/accessor/grib_accessor_class_ifs_param.cc |  93 +++
 src/accessor/grib_accessor_class_ifs_param.h  |  36 +
 .../grib_accessor_class_julian_date.cc        | 163 +----
 .../grib_accessor_class_julian_date.h         |  48 ++
 .../grib_accessor_class_julian_day.cc         | 107 +++
 src/accessor/grib_accessor_class_julian_day.h |  40 ++
 .../grib_accessor_class_ksec1expver.cc        |  95 +++
 .../grib_accessor_class_ksec1expver.h         |  34 +
 src/accessor/grib_accessor_class_label.cc     |  40 ++
 src/accessor/grib_accessor_class_label.h      |  34 +
 .../grib_accessor_class_latitudes.cc          | 127 +---
 src/accessor/grib_accessor_class_latitudes.h  |  38 +
 .../grib_accessor_class_latlon_increment.cc   | 125 +---
 .../grib_accessor_class_latlon_increment.h    |  43 ++
 .../grib_accessor_class_latlonvalues.cc       |  76 ++
 .../grib_accessor_class_latlonvalues.h        |  34 +
 .../grib_accessor_class_library_version.cc    |  46 ++
 .../grib_accessor_class_library_version.h     |  33 +
 .../grib_accessor_class_local_definition.cc   | 136 +---
 .../grib_accessor_class_local_definition.h    |  43 ++
 .../grib_accessor_class_long_vector.cc        |  95 +++
 .../grib_accessor_class_long_vector.h         |  37 +
 .../grib_accessor_class_longitudes.cc         | 123 +---
 src/accessor/grib_accessor_class_longitudes.h |  38 +
 src/accessor/grib_accessor_class_lookup.cc    | 133 ++++
 src/accessor/grib_accessor_class_lookup.h     |  42 ++
 .../grib_accessor_class_mars_param.cc         |  53 ++
 src/accessor/grib_accessor_class_mars_param.h |  36 +
 src/accessor/grib_accessor_class_mars_step.cc | 115 +++
 src/accessor/grib_accessor_class_mars_step.h  |  40 ++
 .../{todo => }/grib_accessor_class_md5.cc     | 126 +---
 src/accessor/grib_accessor_class_md5.h        |  39 +
 src/accessor/grib_accessor_class_message.cc   |  75 ++
 src/accessor/grib_accessor_class_message.h    |  36 +
 .../grib_accessor_class_message_copy.cc       |  59 ++
 .../grib_accessor_class_message_copy.h        |  36 +
 .../grib_accessor_class_multdouble.cc         |  40 ++
 src/accessor/grib_accessor_class_multdouble.h |  34 +
 src/accessor/grib_accessor_class_non_alpha.cc | 112 +++
 src/accessor/grib_accessor_class_non_alpha.h  |  39 +
 ...b_accessor_class_number_of_coded_values.cc |  66 ++
 ...ib_accessor_class_number_of_coded_values.h |  37 +
 .../grib_accessor_class_number_of_points.cc   |  80 +++
 .../grib_accessor_class_number_of_points.h    |  36 +
 ...ccessor_class_number_of_points_gaussian.cc | 148 +---
 ...accessor_class_number_of_points_gaussian.h |  42 ++
 .../grib_accessor_class_number_of_values.cc   |  67 ++
 .../grib_accessor_class_number_of_values.h    |  38 +
 ...class_number_of_values_data_raw_packing.cc |  63 ++
 ..._class_number_of_values_data_raw_packing.h |  35 +
 ...grib_accessor_class_octahedral_gaussian.cc | 120 ++++
 .../grib_accessor_class_octahedral_gaussian.h |  37 +
 .../grib_accessor_class_octet_number.cc       |  47 ++
 .../grib_accessor_class_octet_number.h        |  35 +
 .../grib_accessor_class_offset_file.cc        |  55 ++
 .../grib_accessor_class_offset_file.h         |  33 +
 .../grib_accessor_class_offset_values.cc      |  83 +++
 .../grib_accessor_class_offset_values.h       |  35 +
 .../grib_accessor_class_optimal_step_units.cc | 144 +---
 .../grib_accessor_class_optimal_step_units.h  |  44 ++
 .../grib_accessor_class_pack_bufr_values.cc   |  69 ++
 .../grib_accessor_class_pack_bufr_values.h    |  42 ++
 .../grib_accessor_class_packing_type.cc       |  74 ++
 .../grib_accessor_class_packing_type.h        |  37 +
 src/accessor/grib_accessor_class_pad.cc       |  36 +
 src/accessor/grib_accessor_class_pad.h        |  34 +
 src/accessor/grib_accessor_class_padding.cc   |  58 ++
 src/accessor/grib_accessor_class_padding.h    |  37 +
 src/accessor/grib_accessor_class_padto.cc     |  45 ++
 src/accessor/grib_accessor_class_padto.h      |  34 +
 src/accessor/grib_accessor_class_padtoeven.cc |  48 ++
 src/accessor/grib_accessor_class_padtoeven.h  |  34 +
 .../grib_accessor_class_padtomultiple.cc      |  40 ++
 .../grib_accessor_class_padtomultiple.h       |  34 +
 src/accessor/grib_accessor_class_position.cc  |  50 ++
 src/accessor/grib_accessor_class_position.h   |  34 +
 .../grib_accessor_class_proj_string.cc        | 137 +---
 .../grib_accessor_class_proj_string.h         |  35 +
 src/accessor/grib_accessor_class_raw.cc       | 117 +++
 src/accessor/grib_accessor_class_raw.h        |  41 ++
 .../grib_accessor_class_rdbtime_guess_date.cc |  76 ++
 .../grib_accessor_class_rdbtime_guess_date.h  |  38 +
 ...ib_accessor_class_reference_value_error.cc |  50 ++
 ...rib_accessor_class_reference_value_error.h |  34 +
 src/accessor/grib_accessor_class_round.cc     |  69 ++
 src/accessor/grib_accessor_class_round.h      |  32 +
 src/accessor/grib_accessor_class_scale.cc     | 134 ++++
 src/accessor/grib_accessor_class_scale.h      |  39 +
 .../grib_accessor_class_scale_values.cc       |  85 +++
 .../grib_accessor_class_scale_values.h        |  35 +
 ...essor_class_second_order_bits_per_value.cc | 120 +---
 ...cessor_class_second_order_bits_per_value.h |  37 +
 src/accessor/grib_accessor_class_section.cc   |  95 +++
 src/accessor/grib_accessor_class_section.h    |  37 +
 .../grib_accessor_class_section_length.cc     |  34 +
 .../grib_accessor_class_section_length.h      |  33 +
 .../grib_accessor_class_section_padding.cc    |  70 ++
 .../grib_accessor_class_section_padding.h     |  33 +
 .../grib_accessor_class_section_pointer.cc    |  97 +++
 .../grib_accessor_class_section_pointer.h     |  38 +
 ...rib_accessor_class_select_step_template.cc | 113 +--
 ...grib_accessor_class_select_step_template.h |  36 +
 ...grib_accessor_class_sexagesimal2decimal.cc | 146 ++++
 .../grib_accessor_class_sexagesimal2decimal.h |  34 +
 .../{todo => }/grib_accessor_class_signed.cc  | 160 +----
 src/accessor/grib_accessor_class_signed.h     |  42 ++
 .../grib_accessor_class_signed_bits.cc        | 152 ++++
 .../grib_accessor_class_signed_bits.h         |  40 ++
 ...rib_accessor_class_simple_packing_error.cc |  70 ++
 ...grib_accessor_class_simple_packing_error.h |  37 +
 src/accessor/grib_accessor_class_size.cc      |  35 +
 src/accessor/grib_accessor_class_size.h       |  33 +
 .../grib_accessor_class_smart_table_column.cc | 177 +++++
 .../grib_accessor_class_smart_table_column.h  |  39 +
 src/accessor/grib_accessor_class_spd.cc       | 158 ++++
 src/accessor/grib_accessor_class_spd.h        |  40 ++
 ...grib_accessor_class_spectral_truncation.cc |  81 +++
 .../grib_accessor_class_spectral_truncation.h |  36 +
 .../{todo => }/grib_accessor_class_sprintf.cc | 110 +--
 src/accessor/grib_accessor_class_sprintf.h    |  35 +
 .../grib_accessor_class_statistics.cc         | 143 +---
 src/accessor/grib_accessor_class_statistics.h |  38 +
 ...grib_accessor_class_statistics_spectral.cc | 165 +++++
 .../grib_accessor_class_statistics_spectral.h |  40 ++
 ...grib_accessor_class_step_human_readable.cc |  79 ++
 .../grib_accessor_class_step_human_readable.h |  35 +
 .../grib_accessor_class_step_in_units.cc      | 146 +---
 .../grib_accessor_class_step_in_units.h       |  43 ++
 src/accessor/grib_accessor_class_sum.cc       | 107 +++
 src/accessor/grib_accessor_class_sum.h        |  35 +
 .../grib_accessor_class_suppressed.cc         |  65 ++
 src/accessor/grib_accessor_class_suppressed.h |  37 +
 src/accessor/grib_accessor_class_time.cc      | 113 +++
 src/accessor/grib_accessor_class_time.h       |  37 +
 src/accessor/grib_accessor_class_to_double.cc | 130 ++++
 src/accessor/grib_accessor_class_to_double.h  |  43 ++
 .../grib_accessor_class_to_integer.cc         | 132 ++++
 src/accessor/grib_accessor_class_to_integer.h |  45 ++
 src/accessor/grib_accessor_class_to_string.cc | 120 ++++
 src/accessor/grib_accessor_class_to_string.h  |  42 ++
 .../grib_accessor_class_transient_darray.cc   | 111 +++
 .../grib_accessor_class_transient_darray.h    |  41 ++
 src/accessor/grib_accessor_class_trim.cc      |  76 ++
 src/accessor/grib_accessor_class_trim.h       |  37 +
 src/accessor/grib_accessor_class_uint16.cc    |  35 +
 src/accessor/grib_accessor_class_uint16.h     |  32 +
 src/accessor/grib_accessor_class_uint32.cc    |  35 +
 src/accessor/grib_accessor_class_uint32.h     |  32 +
 ...rib_accessor_class_uint32_little_endian.cc |  35 +
 ...grib_accessor_class_uint32_little_endian.h |  32 +
 src/accessor/grib_accessor_class_uint64.cc    |  51 ++
 src/accessor/grib_accessor_class_uint64.h     |  32 +
 ...rib_accessor_class_uint64_little_endian.cc |  51 ++
 ...grib_accessor_class_uint64_little_endian.h |  32 +
 src/accessor/grib_accessor_class_uint8.cc     |  37 +
 src/accessor/grib_accessor_class_uint8.h      |  32 +
 ...b_accessor_class_unexpanded_descriptors.cc | 132 ++++
 ...ib_accessor_class_unexpanded_descriptors.h |  39 +
 .../grib_accessor_class_unpack_bufr_values.cc |  98 +++
 .../grib_accessor_class_unpack_bufr_values.h  |  42 ++
 .../grib_accessor_class_unsigned_bits.cc      | 159 +++++
 .../grib_accessor_class_unsigned_bits.h       |  40 ++
 .../grib_accessor_class_validity_date.cc      |  96 +++
 .../grib_accessor_class_validity_date.h       |  39 +
 .../grib_accessor_class_validity_time.cc      | 116 +++
 .../grib_accessor_class_validity_time.h       |  39 +
 src/accessor/grib_accessor_class_values.cc    | 139 ++++
 src/accessor/grib_accessor_class_values.h     |  44 ++
 src/accessor/grib_accessor_class_vector.cc    |  57 ++
 src/accessor/grib_accessor_class_vector.h     |  34 +
 src/accessor/grib_accessor_class_when.cc      |  35 +
 src/accessor/grib_accessor_class_when.h       |  34 +
 ...rib_accessor_class_abstract_long_vector.cc | 103 ---
 .../grib_accessor_class_abstract_vector.cc    |  98 ---
 .../todo/grib_accessor_class_ascii.cc         | 278 --------
 src/accessor/todo/grib_accessor_class_bit.cc  | 170 -----
 .../todo/grib_accessor_class_bitmap.cc        | 297 --------
 .../grib_accessor_class_bits_per_value.cc     | 165 -----
 src/accessor/todo/grib_accessor_class_blob.cc | 128 ----
 .../todo/grib_accessor_class_budgdate.cc      | 174 -----
 ...rib_accessor_class_bufr_extract_subsets.cc | 152 ----
 .../todo/grib_accessor_class_bufr_group.cc    | 126 ----
 ...rib_accessor_class_bufr_simple_thinning.cc | 211 ------
 .../grib_accessor_class_bufr_string_values.cc | 189 -----
 ...essor_class_bufrdc_expanded_descriptors.cc | 206 ------
 .../todo/grib_accessor_class_bytes.cc         | 192 -----
 ...r_class_change_alternative_row_scanning.cc | 212 ------
 ...b_accessor_class_check_internal_version.cc | 136 ----
 .../todo/grib_accessor_class_codeflag.cc      | 216 ------
 .../grib_accessor_class_codetable_title.cc    | 171 -----
 .../grib_accessor_class_codetable_units.cc    | 171 -----
 .../todo/grib_accessor_class_count_file.cc    | 114 ---
 .../todo/grib_accessor_class_count_total.cc   | 116 ---
 .../grib_accessor_class_data_dummy_field.cc   | 219 ------
 ...b_accessor_class_data_g1complex_packing.cc | 235 ------
 ..._accessor_class_data_g1secondary_bitmap.cc | 220 ------
 ..._accessor_class_data_g1shsimple_packing.cc | 150 ----
 ...b_accessor_class_data_g2complex_packing.cc | 164 -----
 ..._accessor_class_data_g2secondary_bitmap.cc | 199 ------
 ..._accessor_class_data_g2shsimple_packing.cc | 188 -----
 ...ata_g2simple_packing_with_preprocessing.cc | 287 --------
 .../grib_accessor_class_data_raw_packing.cc   | 306 --------
 ...ib_accessor_class_data_secondary_bitmap.cc | 214 ------
 ...ib_accessor_class_data_shsimple_packing.cc | 153 ----
 .../grib_accessor_class_decimal_precision.cc  | 199 ------
 .../todo/grib_accessor_class_dirty.cc         | 138 ----
 .../todo/grib_accessor_class_divdouble.cc     | 129 ----
 .../todo/grib_accessor_class_double.cc        | 201 ------
 .../todo/grib_accessor_class_evaluate.cc      | 118 ---
 ...ib_accessor_class_g1_half_byte_codeflag.cc | 150 ----
 .../grib_accessor_class_g1_section4_length.cc | 143 ----
 .../todo/grib_accessor_class_g1bitmap.cc      | 206 ------
 ...b_accessor_class_g1day_of_the_year_date.cc | 152 ----
 ...ccessor_class_g1end_of_interval_monthly.cc | 234 ------
 .../todo/grib_accessor_class_g1fcperiod.cc    | 134 ----
 .../todo/grib_accessor_class_g1monthlydate.cc | 132 ----
 ...ass_g1number_of_coded_values_sh_complex.cc | 183 -----
 ...lass_g1number_of_coded_values_sh_simple.cc | 158 ----
 .../grib_accessor_class_g1verificationdate.cc | 154 ----
 .../todo/grib_accessor_class_g2_aerosol.cc    | 210 ------
 .../todo/grib_accessor_class_g2bitmap.cc      | 178 -----
 .../grib_accessor_class_g2bitmap_present.cc   | 150 ----
 .../todo/grib_accessor_class_g2date.cc        | 175 -----
 .../todo/grib_accessor_class_g2latlon.cc      | 215 ------
 .../todo/grib_accessor_class_g2lon.cc         | 149 ----
 .../grib_accessor_class_gaussian_grid_name.cc | 176 -----
 .../grib_accessor_class_gds_is_present.cc     | 183 -----
 ...b_accessor_class_gds_not_present_bitmap.cc | 216 ------
 src/accessor/todo/grib_accessor_class_gen.cc  | 675 ------------------
 .../todo/grib_accessor_class_getenv.cc        | 157 ----
 .../todo/grib_accessor_class_group.cc         | 272 -------
 .../todo/grib_accessor_class_gts_header.cc    | 152 ----
 .../todo/grib_accessor_class_hash_array.cc    | 293 --------
 .../todo/grib_accessor_class_headers_only.cc  | 116 ---
 .../todo/grib_accessor_class_ibmfloat.cc      | 264 -------
 .../todo/grib_accessor_class_ieeefloat.cc     | 226 ------
 .../todo/grib_accessor_class_ifs_param.cc     | 188 -----
 .../todo/grib_accessor_class_julian_day.cc    | 209 ------
 .../todo/grib_accessor_class_ksec1expver.cc   | 185 -----
 .../todo/grib_accessor_class_label.cc         | 125 ----
 .../todo/grib_accessor_class_latlonvalues.cc  | 164 -----
 .../grib_accessor_class_library_version.cc    | 130 ----
 .../todo/grib_accessor_class_long_vector.cc   | 208 ------
 .../todo/grib_accessor_class_lookup.cc        | 242 -------
 .../todo/grib_accessor_class_mars_param.cc    | 144 ----
 .../todo/grib_accessor_class_mars_step.cc     | 218 ------
 .../todo/grib_accessor_class_message.cc       | 166 -----
 .../todo/grib_accessor_class_message_copy.cc  | 151 ----
 .../todo/grib_accessor_class_multdouble.cc    | 127 ----
 .../todo/grib_accessor_class_non_alpha.cc     | 215 ------
 ...b_accessor_class_number_of_coded_values.cc | 162 -----
 .../grib_accessor_class_number_of_points.cc   | 174 -----
 .../grib_accessor_class_number_of_values.cc   | 165 -----
 ...class_number_of_values_data_raw_packing.cc | 165 -----
 ...grib_accessor_class_octahedral_gaussian.cc | 216 ------
 .../todo/grib_accessor_class_octet_number.cc  | 136 ----
 .../todo/grib_accessor_class_offset_file.cc   | 141 ----
 .../todo/grib_accessor_class_offset_values.cc | 175 -----
 .../grib_accessor_class_pack_bufr_values.cc   | 177 -----
 .../todo/grib_accessor_class_packing_type.cc  | 167 -----
 src/accessor/todo/grib_accessor_class_pad.cc  | 126 ----
 .../todo/grib_accessor_class_padding.cc       | 151 ----
 .../todo/grib_accessor_class_padto.cc         | 136 ----
 .../todo/grib_accessor_class_padtoeven.cc     | 139 ----
 .../todo/grib_accessor_class_padtomultiple.cc | 132 ----
 .../todo/grib_accessor_class_position.cc      | 137 ----
 src/accessor/todo/grib_accessor_class_raw.cc  | 219 ------
 .../grib_accessor_class_rdbtime_guess_date.cc | 172 -----
 ...ib_accessor_class_reference_value_error.cc | 142 ----
 .../todo/grib_accessor_class_round.cc         | 154 ----
 .../todo/grib_accessor_class_scale.cc         | 237 ------
 .../todo/grib_accessor_class_scale_values.cc  | 177 -----
 .../todo/grib_accessor_class_section.cc       | 194 -----
 .../grib_accessor_class_section_length.cc     | 122 ----
 .../grib_accessor_class_section_padding.cc    | 155 ----
 .../grib_accessor_class_section_pointer.cc    | 194 -----
 ...grib_accessor_class_sexagesimal2decimal.cc | 241 -------
 .../todo/grib_accessor_class_signed_bits.cc   | 258 -------
 ...rib_accessor_class_simple_packing_error.cc | 163 -----
 src/accessor/todo/grib_accessor_class_size.cc | 119 ---
 .../grib_accessor_class_smart_table_column.cc | 294 --------
 src/accessor/todo/grib_accessor_class_spd.cc  | 264 -------
 ...grib_accessor_class_spectral_truncation.cc | 177 -----
 ...grib_accessor_class_statistics_spectral.cc | 277 -------
 ...grib_accessor_class_step_human_readable.cc | 169 -----
 src/accessor/todo/grib_accessor_class_sum.cc  | 203 ------
 .../todo/grib_accessor_class_suppressed.cc    | 162 -----
 src/accessor/todo/grib_accessor_class_time.cc | 208 ------
 .../todo/grib_accessor_class_to_double.cc     | 241 -------
 .../todo/grib_accessor_class_to_integer.cc    | 245 -------
 .../todo/grib_accessor_class_to_string.cc     | 227 ------
 .../grib_accessor_class_transient_darray.cc   | 214 ------
 src/accessor/todo/grib_accessor_class_trim.cc | 170 -----
 .../todo/grib_accessor_class_uint16.cc        | 118 ---
 .../todo/grib_accessor_class_uint32.cc        | 118 ---
 ...rib_accessor_class_uint32_little_endian.cc | 118 ---
 .../todo/grib_accessor_class_uint64.cc        | 134 ----
 ...rib_accessor_class_uint64_little_endian.cc | 134 ----
 .../todo/grib_accessor_class_uint8.cc         | 120 ----
 ...b_accessor_class_unexpanded_descriptors.cc | 236 ------
 .../grib_accessor_class_unpack_bufr_values.cc | 207 ------
 .../todo/grib_accessor_class_unsigned_bits.cc | 265 -------
 .../todo/grib_accessor_class_validity_date.cc | 229 ------
 .../todo/grib_accessor_class_validity_time.cc | 249 -------
 .../todo/grib_accessor_class_values.cc        | 259 -------
 .../todo/grib_accessor_class_vector.cc        | 162 -----
 src/accessor/todo/grib_accessor_class_when.cc | 122 ----
 src/eccodes_prototypes.h                      |   7 -
 src/grib_accessor_class.h                     | 392 +++++-----
 src/grib_accessor_classes_hash.cc             | 597 ++++++++++++++--
 src/grib_accessor_factory.h                   | 390 +++++-----
 src/grib_accessor_factory_hash_list           | 390 +++++-----
 src/shared_functions.cc                       |  47 ++
 src/shared_functions.h                        |   9 +
 532 files changed, 21431 insertions(+), 34120 deletions(-)
 create mode 100644 src/accessor/grib_accessor_class_abstract_long_vector.cc
 create mode 100644 src/accessor/grib_accessor_class_abstract_long_vector.h
 create mode 100644 src/accessor/grib_accessor_class_abstract_vector.cc
 create mode 100644 src/accessor/grib_accessor_class_abstract_vector.h
 create mode 100644 src/accessor/grib_accessor_class_ascii.cc
 create mode 100644 src/accessor/grib_accessor_class_ascii.h
 create mode 100644 src/accessor/grib_accessor_class_bit.cc
 create mode 100644 src/accessor/grib_accessor_class_bit.h
 create mode 100644 src/accessor/grib_accessor_class_bitmap.cc
 create mode 100644 src/accessor/grib_accessor_class_bitmap.h
 rename src/accessor/{todo => }/grib_accessor_class_bits.cc (51%)
 create mode 100644 src/accessor/grib_accessor_class_bits.h
 create mode 100644 src/accessor/grib_accessor_class_bits_per_value.cc
 create mode 100644 src/accessor/grib_accessor_class_bits_per_value.h
 create mode 100644 src/accessor/grib_accessor_class_blob.cc
 create mode 100644 src/accessor/grib_accessor_class_blob.h
 create mode 100644 src/accessor/grib_accessor_class_budgdate.cc
 create mode 100644 src/accessor/grib_accessor_class_budgdate.h
 rename src/accessor/{todo => }/grib_accessor_class_bufr_data_array.cc (87%)
 create mode 100644 src/accessor/grib_accessor_class_bufr_data_array.h
 rename src/accessor/{todo => }/grib_accessor_class_bufr_data_element.cc (68%)
 create mode 100644 src/accessor/grib_accessor_class_bufr_data_element.h
 rename src/accessor/{todo => }/grib_accessor_class_bufr_elements_table.cc (68%)
 create mode 100644 src/accessor/grib_accessor_class_bufr_elements_table.h
 rename src/accessor/{todo => }/grib_accessor_class_bufr_extract_area_subsets.cc (57%)
 create mode 100644 src/accessor/grib_accessor_class_bufr_extract_area_subsets.h
 rename src/accessor/{todo => }/grib_accessor_class_bufr_extract_datetime_subsets.cc (76%)
 create mode 100644 src/accessor/grib_accessor_class_bufr_extract_datetime_subsets.h
 create mode 100644 src/accessor/grib_accessor_class_bufr_extract_subsets.cc
 create mode 100644 src/accessor/grib_accessor_class_bufr_extract_subsets.h
 create mode 100644 src/accessor/grib_accessor_class_bufr_group.cc
 create mode 100644 src/accessor/grib_accessor_class_bufr_group.h
 create mode 100644 src/accessor/grib_accessor_class_bufr_simple_thinning.cc
 create mode 100644 src/accessor/grib_accessor_class_bufr_simple_thinning.h
 create mode 100644 src/accessor/grib_accessor_class_bufr_string_values.cc
 create mode 100644 src/accessor/grib_accessor_class_bufr_string_values.h
 create mode 100644 src/accessor/grib_accessor_class_bufrdc_expanded_descriptors.cc
 create mode 100644 src/accessor/grib_accessor_class_bufrdc_expanded_descriptors.h
 create mode 100644 src/accessor/grib_accessor_class_bytes.cc
 create mode 100644 src/accessor/grib_accessor_class_bytes.h
 create mode 100644 src/accessor/grib_accessor_class_change_alternative_row_scanning.cc
 create mode 100644 src/accessor/grib_accessor_class_change_alternative_row_scanning.h
 rename src/accessor/{todo => }/grib_accessor_class_change_scanning_direction.cc (57%)
 create mode 100644 src/accessor/grib_accessor_class_change_scanning_direction.h
 create mode 100644 src/accessor/grib_accessor_class_check_internal_version.cc
 create mode 100644 src/accessor/grib_accessor_class_check_internal_version.h
 rename src/accessor/{todo => }/grib_accessor_class_closest_date.cc (57%)
 create mode 100644 src/accessor/grib_accessor_class_closest_date.h
 create mode 100644 src/accessor/grib_accessor_class_codeflag.cc
 create mode 100644 src/accessor/grib_accessor_class_codeflag.h
 create mode 100644 src/accessor/grib_accessor_class_codetable_title.cc
 create mode 100644 src/accessor/grib_accessor_class_codetable_title.h
 create mode 100644 src/accessor/grib_accessor_class_codetable_units.cc
 create mode 100644 src/accessor/grib_accessor_class_codetable_units.h
 rename src/accessor/{todo => }/grib_accessor_class_concept.cc (71%)
 create mode 100644 src/accessor/grib_accessor_class_concept.h
 create mode 100644 src/accessor/grib_accessor_class_count_file.cc
 create mode 100644 src/accessor/grib_accessor_class_count_file.h
 rename src/accessor/{todo => }/grib_accessor_class_count_missing.cc (55%)
 create mode 100644 src/accessor/grib_accessor_class_count_missing.h
 create mode 100644 src/accessor/grib_accessor_class_count_total.cc
 create mode 100644 src/accessor/grib_accessor_class_count_total.h
 rename src/accessor/{todo => }/grib_accessor_class_data_apply_bitmap.cc (64%)
 create mode 100644 src/accessor/grib_accessor_class_data_apply_bitmap.h
 rename src/accessor/{todo => }/grib_accessor_class_data_apply_boustrophedonic.cc (61%)
 create mode 100644 src/accessor/grib_accessor_class_data_apply_boustrophedonic.h
 rename src/accessor/{todo => }/grib_accessor_class_data_apply_boustrophedonic_bitmap.cc (69%)
 create mode 100644 src/accessor/grib_accessor_class_data_apply_boustrophedonic_bitmap.h
 rename src/accessor/{todo => }/grib_accessor_class_data_ccsds_packing.cc (77%)
 create mode 100644 src/accessor/grib_accessor_class_data_ccsds_packing.h
 rename src/accessor/{todo => }/grib_accessor_class_data_complex_packing.cc (82%)
 create mode 100644 src/accessor/grib_accessor_class_data_complex_packing.h
 create mode 100644 src/accessor/grib_accessor_class_data_dummy_field.cc
 create mode 100644 src/accessor/grib_accessor_class_data_dummy_field.h
 create mode 100644 src/accessor/grib_accessor_class_data_g1complex_packing.cc
 create mode 100644 src/accessor/grib_accessor_class_data_g1complex_packing.h
 rename src/accessor/{todo => }/grib_accessor_class_data_g1second_order_constant_width_packing.cc (58%)
 create mode 100644 src/accessor/grib_accessor_class_data_g1second_order_constant_width_packing.h
 rename src/accessor/{todo => }/grib_accessor_class_data_g1second_order_general_extended_packing.cc (85%)
 create mode 100644 src/accessor/grib_accessor_class_data_g1second_order_general_extended_packing.h
 rename src/accessor/{todo => }/grib_accessor_class_data_g1second_order_general_packing.cc (55%)
 create mode 100644 src/accessor/grib_accessor_class_data_g1second_order_general_packing.h
 rename src/accessor/{todo => }/grib_accessor_class_data_g1second_order_row_by_row_packing.cc (64%)
 create mode 100644 src/accessor/grib_accessor_class_data_g1second_order_row_by_row_packing.h
 create mode 100644 src/accessor/grib_accessor_class_data_g1secondary_bitmap.cc
 create mode 100644 src/accessor/grib_accessor_class_data_g1secondary_bitmap.h
 create mode 100644 src/accessor/grib_accessor_class_data_g1shsimple_packing.cc
 create mode 100644 src/accessor/grib_accessor_class_data_g1shsimple_packing.h
 rename src/accessor/{todo => }/grib_accessor_class_data_g1simple_packing.cc (64%)
 create mode 100644 src/accessor/grib_accessor_class_data_g1simple_packing.h
 rename src/accessor/{todo => }/grib_accessor_class_data_g22order_packing.cc (88%)
 create mode 100644 src/accessor/grib_accessor_class_data_g22order_packing.h
 rename src/accessor/{todo => }/grib_accessor_class_data_g2bifourier_packing.cc (77%)
 create mode 100644 src/accessor/grib_accessor_class_data_g2bifourier_packing.h
 create mode 100644 src/accessor/grib_accessor_class_data_g2complex_packing.cc
 create mode 100644 src/accessor/grib_accessor_class_data_g2complex_packing.h
 create mode 100644 src/accessor/grib_accessor_class_data_g2secondary_bitmap.cc
 create mode 100644 src/accessor/grib_accessor_class_data_g2secondary_bitmap.h
 create mode 100644 src/accessor/grib_accessor_class_data_g2shsimple_packing.cc
 create mode 100644 src/accessor/grib_accessor_class_data_g2shsimple_packing.h
 rename src/accessor/{todo => }/grib_accessor_class_data_g2simple_packing.cc (51%)
 create mode 100644 src/accessor/grib_accessor_class_data_g2simple_packing.h
 create mode 100644 src/accessor/grib_accessor_class_data_g2simple_packing_with_preprocessing.cc
 create mode 100644 src/accessor/grib_accessor_class_data_g2simple_packing_with_preprocessing.h
 rename src/accessor/{todo => }/grib_accessor_class_data_jpeg2000_packing.cc (73%)
 create mode 100644 src/accessor/grib_accessor_class_data_jpeg2000_packing.h
 rename src/accessor/{todo => }/grib_accessor_class_data_png_packing.cc (75%)
 create mode 100644 src/accessor/grib_accessor_class_data_png_packing.h
 create mode 100644 src/accessor/grib_accessor_class_data_raw_packing.cc
 create mode 100644 src/accessor/grib_accessor_class_data_raw_packing.h
 rename src/accessor/{todo => }/grib_accessor_class_data_run_length_packing.cc (73%)
 create mode 100644 src/accessor/grib_accessor_class_data_run_length_packing.h
 create mode 100644 src/accessor/grib_accessor_class_data_secondary_bitmap.cc
 create mode 100644 src/accessor/grib_accessor_class_data_secondary_bitmap.h
 rename src/accessor/{todo => }/grib_accessor_class_data_sh_packed.cc (63%)
 create mode 100644 src/accessor/grib_accessor_class_data_sh_packed.h
 rename src/accessor/{todo => }/grib_accessor_class_data_sh_unpacked.cc (61%)
 create mode 100644 src/accessor/grib_accessor_class_data_sh_unpacked.h
 create mode 100644 src/accessor/grib_accessor_class_data_shsimple_packing.cc
 create mode 100644 src/accessor/grib_accessor_class_data_shsimple_packing.h
 rename src/accessor/{todo => }/grib_accessor_class_data_simple_packing.cc (79%)
 create mode 100644 src/accessor/grib_accessor_class_data_simple_packing.h
 create mode 100644 src/accessor/grib_accessor_class_decimal_precision.cc
 create mode 100644 src/accessor/grib_accessor_class_decimal_precision.h
 rename src/accessor/{todo => }/grib_accessor_class_dictionary.cc (62%)
 create mode 100644 src/accessor/grib_accessor_class_dictionary.h
 create mode 100644 src/accessor/grib_accessor_class_dirty.cc
 create mode 100644 src/accessor/grib_accessor_class_dirty.h
 create mode 100644 src/accessor/grib_accessor_class_divdouble.cc
 create mode 100644 src/accessor/grib_accessor_class_divdouble.h
 create mode 100644 src/accessor/grib_accessor_class_double.cc
 create mode 100644 src/accessor/grib_accessor_class_double.h
 rename src/accessor/{todo => }/grib_accessor_class_element.cc (55%)
 create mode 100644 src/accessor/grib_accessor_class_element.h
 create mode 100644 src/accessor/grib_accessor_class_evaluate.cc
 create mode 100644 src/accessor/grib_accessor_class_evaluate.h
 rename src/accessor/{todo => }/grib_accessor_class_expanded_descriptors.cc (80%)
 create mode 100644 src/accessor/grib_accessor_class_expanded_descriptors.h
 rename src/accessor/{todo => }/grib_accessor_class_from_scale_factor_scaled_value.cc (59%)
 create mode 100644 src/accessor/grib_accessor_class_from_scale_factor_scaled_value.h
 create mode 100644 src/accessor/grib_accessor_class_g1_half_byte_codeflag.cc
 create mode 100644 src/accessor/grib_accessor_class_g1_half_byte_codeflag.h
 rename src/accessor/{todo => }/grib_accessor_class_g1_message_length.cc (53%)
 create mode 100644 src/accessor/grib_accessor_class_g1_message_length.h
 create mode 100644 src/accessor/grib_accessor_class_g1_section4_length.cc
 create mode 100644 src/accessor/grib_accessor_class_g1_section4_length.h
 create mode 100644 src/accessor/grib_accessor_class_g1bitmap.cc
 create mode 100644 src/accessor/grib_accessor_class_g1bitmap.h
 rename src/accessor/{todo => }/grib_accessor_class_g1date.cc (51%)
 create mode 100644 src/accessor/grib_accessor_class_g1date.h
 create mode 100644 src/accessor/grib_accessor_class_g1day_of_the_year_date.cc
 create mode 100644 src/accessor/grib_accessor_class_g1day_of_the_year_date.h
 create mode 100644 src/accessor/grib_accessor_class_g1end_of_interval_monthly.cc
 create mode 100644 src/accessor/grib_accessor_class_g1end_of_interval_monthly.h
 create mode 100644 src/accessor/grib_accessor_class_g1fcperiod.cc
 create mode 100644 src/accessor/grib_accessor_class_g1fcperiod.h
 rename src/accessor/{todo => }/grib_accessor_class_g1forecastmonth.cc (58%)
 create mode 100644 src/accessor/grib_accessor_class_g1forecastmonth.h
 create mode 100644 src/accessor/grib_accessor_class_g1monthlydate.cc
 create mode 100644 src/accessor/grib_accessor_class_g1monthlydate.h
 create mode 100644 src/accessor/grib_accessor_class_g1number_of_coded_values_sh_complex.cc
 create mode 100644 src/accessor/grib_accessor_class_g1number_of_coded_values_sh_complex.h
 create mode 100644 src/accessor/grib_accessor_class_g1number_of_coded_values_sh_simple.cc
 create mode 100644 src/accessor/grib_accessor_class_g1number_of_coded_values_sh_simple.h
 rename src/accessor/{todo => }/grib_accessor_class_g1step_range.cc (79%)
 create mode 100644 src/accessor/grib_accessor_class_g1step_range.h
 create mode 100644 src/accessor/grib_accessor_class_g1verificationdate.cc
 create mode 100644 src/accessor/grib_accessor_class_g1verificationdate.h
 create mode 100644 src/accessor/grib_accessor_class_g2_aerosol.cc
 create mode 100644 src/accessor/grib_accessor_class_g2_aerosol.h
 rename src/accessor/{todo => }/grib_accessor_class_g2_chemical.cc (54%)
 create mode 100644 src/accessor/grib_accessor_class_g2_chemical.h
 rename src/accessor/{todo => }/grib_accessor_class_g2_eps.cc (58%)
 create mode 100644 src/accessor/grib_accessor_class_g2_eps.h
 rename src/accessor/{todo => }/grib_accessor_class_g2_mars_labeling.cc (75%)
 create mode 100644 src/accessor/grib_accessor_class_g2_mars_labeling.h
 create mode 100644 src/accessor/grib_accessor_class_g2bitmap.cc
 create mode 100644 src/accessor/grib_accessor_class_g2bitmap.h
 create mode 100644 src/accessor/grib_accessor_class_g2bitmap_present.cc
 create mode 100644 src/accessor/grib_accessor_class_g2bitmap_present.h
 create mode 100644 src/accessor/grib_accessor_class_g2date.cc
 create mode 100644 src/accessor/grib_accessor_class_g2date.h
 rename src/accessor/{todo => }/grib_accessor_class_g2end_step.cc (76%)
 create mode 100644 src/accessor/grib_accessor_class_g2end_step.h
 rename src/accessor/{todo => }/grib_accessor_class_g2grid.cc (58%)
 create mode 100644 src/accessor/grib_accessor_class_g2grid.h
 create mode 100644 src/accessor/grib_accessor_class_g2latlon.cc
 create mode 100644 src/accessor/grib_accessor_class_g2latlon.h
 rename src/accessor/{todo => }/grib_accessor_class_g2level.cc (66%)
 create mode 100644 src/accessor/grib_accessor_class_g2level.h
 create mode 100644 src/accessor/grib_accessor_class_g2lon.cc
 create mode 100644 src/accessor/grib_accessor_class_g2lon.h
 rename src/accessor/{todo => }/grib_accessor_class_g2step_range.cc (64%)
 create mode 100644 src/accessor/grib_accessor_class_g2step_range.h
 create mode 100644 src/accessor/grib_accessor_class_gaussian_grid_name.cc
 create mode 100644 src/accessor/grib_accessor_class_gaussian_grid_name.h
 create mode 100644 src/accessor/grib_accessor_class_gds_is_present.cc
 create mode 100644 src/accessor/grib_accessor_class_gds_is_present.h
 create mode 100644 src/accessor/grib_accessor_class_gds_not_present_bitmap.cc
 create mode 100644 src/accessor/grib_accessor_class_gds_not_present_bitmap.h
 create mode 100644 src/accessor/grib_accessor_class_getenv.cc
 create mode 100644 src/accessor/grib_accessor_class_getenv.h
 rename src/accessor/{todo => }/grib_accessor_class_global_gaussian.cc (64%)
 create mode 100644 src/accessor/grib_accessor_class_global_gaussian.h
 create mode 100644 src/accessor/grib_accessor_class_group.cc
 create mode 100644 src/accessor/grib_accessor_class_group.h
 create mode 100644 src/accessor/grib_accessor_class_gts_header.cc
 create mode 100644 src/accessor/grib_accessor_class_gts_header.h
 create mode 100644 src/accessor/grib_accessor_class_hash_array.cc
 create mode 100644 src/accessor/grib_accessor_class_hash_array.h
 create mode 100644 src/accessor/grib_accessor_class_headers_only.cc
 create mode 100644 src/accessor/grib_accessor_class_headers_only.h
 create mode 100644 src/accessor/grib_accessor_class_ibmfloat.cc
 create mode 100644 src/accessor/grib_accessor_class_ibmfloat.h
 create mode 100644 src/accessor/grib_accessor_class_ieeefloat.cc
 create mode 100644 src/accessor/grib_accessor_class_ieeefloat.h
 create mode 100644 src/accessor/grib_accessor_class_ifs_param.cc
 create mode 100644 src/accessor/grib_accessor_class_ifs_param.h
 rename src/accessor/{todo => }/grib_accessor_class_julian_date.cc (66%)
 create mode 100644 src/accessor/grib_accessor_class_julian_date.h
 create mode 100644 src/accessor/grib_accessor_class_julian_day.cc
 create mode 100644 src/accessor/grib_accessor_class_julian_day.h
 create mode 100644 src/accessor/grib_accessor_class_ksec1expver.cc
 create mode 100644 src/accessor/grib_accessor_class_ksec1expver.h
 create mode 100644 src/accessor/grib_accessor_class_label.cc
 create mode 100644 src/accessor/grib_accessor_class_label.h
 rename src/accessor/{todo => }/grib_accessor_class_latitudes.cc (59%)
 create mode 100644 src/accessor/grib_accessor_class_latitudes.h
 rename src/accessor/{todo => }/grib_accessor_class_latlon_increment.cc (61%)
 create mode 100644 src/accessor/grib_accessor_class_latlon_increment.h
 create mode 100644 src/accessor/grib_accessor_class_latlonvalues.cc
 create mode 100644 src/accessor/grib_accessor_class_latlonvalues.h
 create mode 100644 src/accessor/grib_accessor_class_library_version.cc
 create mode 100644 src/accessor/grib_accessor_class_library_version.h
 rename src/accessor/{todo => }/grib_accessor_class_local_definition.cc (72%)
 create mode 100644 src/accessor/grib_accessor_class_local_definition.h
 create mode 100644 src/accessor/grib_accessor_class_long_vector.cc
 create mode 100644 src/accessor/grib_accessor_class_long_vector.h
 rename src/accessor/{todo => }/grib_accessor_class_longitudes.cc (56%)
 create mode 100644 src/accessor/grib_accessor_class_longitudes.h
 create mode 100644 src/accessor/grib_accessor_class_lookup.cc
 create mode 100644 src/accessor/grib_accessor_class_lookup.h
 create mode 100644 src/accessor/grib_accessor_class_mars_param.cc
 create mode 100644 src/accessor/grib_accessor_class_mars_param.h
 create mode 100644 src/accessor/grib_accessor_class_mars_step.cc
 create mode 100644 src/accessor/grib_accessor_class_mars_step.h
 rename src/accessor/{todo => }/grib_accessor_class_md5.cc (51%)
 create mode 100644 src/accessor/grib_accessor_class_md5.h
 create mode 100644 src/accessor/grib_accessor_class_message.cc
 create mode 100644 src/accessor/grib_accessor_class_message.h
 create mode 100644 src/accessor/grib_accessor_class_message_copy.cc
 create mode 100644 src/accessor/grib_accessor_class_message_copy.h
 create mode 100644 src/accessor/grib_accessor_class_multdouble.cc
 create mode 100644 src/accessor/grib_accessor_class_multdouble.h
 create mode 100644 src/accessor/grib_accessor_class_non_alpha.cc
 create mode 100644 src/accessor/grib_accessor_class_non_alpha.h
 create mode 100644 src/accessor/grib_accessor_class_number_of_coded_values.cc
 create mode 100644 src/accessor/grib_accessor_class_number_of_coded_values.h
 create mode 100644 src/accessor/grib_accessor_class_number_of_points.cc
 create mode 100644 src/accessor/grib_accessor_class_number_of_points.h
 rename src/accessor/{todo => }/grib_accessor_class_number_of_points_gaussian.cc (72%)
 create mode 100644 src/accessor/grib_accessor_class_number_of_points_gaussian.h
 create mode 100644 src/accessor/grib_accessor_class_number_of_values.cc
 create mode 100644 src/accessor/grib_accessor_class_number_of_values.h
 create mode 100644 src/accessor/grib_accessor_class_number_of_values_data_raw_packing.cc
 create mode 100644 src/accessor/grib_accessor_class_number_of_values_data_raw_packing.h
 create mode 100644 src/accessor/grib_accessor_class_octahedral_gaussian.cc
 create mode 100644 src/accessor/grib_accessor_class_octahedral_gaussian.h
 create mode 100644 src/accessor/grib_accessor_class_octet_number.cc
 create mode 100644 src/accessor/grib_accessor_class_octet_number.h
 create mode 100644 src/accessor/grib_accessor_class_offset_file.cc
 create mode 100644 src/accessor/grib_accessor_class_offset_file.h
 create mode 100644 src/accessor/grib_accessor_class_offset_values.cc
 create mode 100644 src/accessor/grib_accessor_class_offset_values.h
 rename src/accessor/{todo => }/grib_accessor_class_optimal_step_units.cc (54%)
 create mode 100644 src/accessor/grib_accessor_class_optimal_step_units.h
 create mode 100644 src/accessor/grib_accessor_class_pack_bufr_values.cc
 create mode 100644 src/accessor/grib_accessor_class_pack_bufr_values.h
 create mode 100644 src/accessor/grib_accessor_class_packing_type.cc
 create mode 100644 src/accessor/grib_accessor_class_packing_type.h
 create mode 100644 src/accessor/grib_accessor_class_pad.cc
 create mode 100644 src/accessor/grib_accessor_class_pad.h
 create mode 100644 src/accessor/grib_accessor_class_padding.cc
 create mode 100644 src/accessor/grib_accessor_class_padding.h
 create mode 100644 src/accessor/grib_accessor_class_padto.cc
 create mode 100644 src/accessor/grib_accessor_class_padto.h
 create mode 100644 src/accessor/grib_accessor_class_padtoeven.cc
 create mode 100644 src/accessor/grib_accessor_class_padtoeven.h
 create mode 100644 src/accessor/grib_accessor_class_padtomultiple.cc
 create mode 100644 src/accessor/grib_accessor_class_padtomultiple.h
 create mode 100644 src/accessor/grib_accessor_class_position.cc
 create mode 100644 src/accessor/grib_accessor_class_position.h
 rename src/accessor/{todo => }/grib_accessor_class_proj_string.cc (67%)
 create mode 100644 src/accessor/grib_accessor_class_proj_string.h
 create mode 100644 src/accessor/grib_accessor_class_raw.cc
 create mode 100644 src/accessor/grib_accessor_class_raw.h
 create mode 100644 src/accessor/grib_accessor_class_rdbtime_guess_date.cc
 create mode 100644 src/accessor/grib_accessor_class_rdbtime_guess_date.h
 create mode 100644 src/accessor/grib_accessor_class_reference_value_error.cc
 create mode 100644 src/accessor/grib_accessor_class_reference_value_error.h
 create mode 100644 src/accessor/grib_accessor_class_round.cc
 create mode 100644 src/accessor/grib_accessor_class_round.h
 create mode 100644 src/accessor/grib_accessor_class_scale.cc
 create mode 100644 src/accessor/grib_accessor_class_scale.h
 create mode 100644 src/accessor/grib_accessor_class_scale_values.cc
 create mode 100644 src/accessor/grib_accessor_class_scale_values.h
 rename src/accessor/{todo => }/grib_accessor_class_second_order_bits_per_value.cc (51%)
 create mode 100644 src/accessor/grib_accessor_class_second_order_bits_per_value.h
 create mode 100644 src/accessor/grib_accessor_class_section.cc
 create mode 100644 src/accessor/grib_accessor_class_section.h
 create mode 100644 src/accessor/grib_accessor_class_section_length.cc
 create mode 100644 src/accessor/grib_accessor_class_section_length.h
 create mode 100644 src/accessor/grib_accessor_class_section_padding.cc
 create mode 100644 src/accessor/grib_accessor_class_section_padding.h
 create mode 100644 src/accessor/grib_accessor_class_section_pointer.cc
 create mode 100644 src/accessor/grib_accessor_class_section_pointer.h
 rename src/accessor/{todo => }/grib_accessor_class_select_step_template.cc (60%)
 create mode 100644 src/accessor/grib_accessor_class_select_step_template.h
 create mode 100644 src/accessor/grib_accessor_class_sexagesimal2decimal.cc
 create mode 100644 src/accessor/grib_accessor_class_sexagesimal2decimal.h
 rename src/accessor/{todo => }/grib_accessor_class_signed.cc (51%)
 create mode 100644 src/accessor/grib_accessor_class_signed.h
 create mode 100644 src/accessor/grib_accessor_class_signed_bits.cc
 create mode 100644 src/accessor/grib_accessor_class_signed_bits.h
 create mode 100644 src/accessor/grib_accessor_class_simple_packing_error.cc
 create mode 100644 src/accessor/grib_accessor_class_simple_packing_error.h
 create mode 100644 src/accessor/grib_accessor_class_size.cc
 create mode 100644 src/accessor/grib_accessor_class_size.h
 create mode 100644 src/accessor/grib_accessor_class_smart_table_column.cc
 create mode 100644 src/accessor/grib_accessor_class_smart_table_column.h
 create mode 100644 src/accessor/grib_accessor_class_spd.cc
 create mode 100644 src/accessor/grib_accessor_class_spd.h
 create mode 100644 src/accessor/grib_accessor_class_spectral_truncation.cc
 create mode 100644 src/accessor/grib_accessor_class_spectral_truncation.h
 rename src/accessor/{todo => }/grib_accessor_class_sprintf.cc (54%)
 create mode 100644 src/accessor/grib_accessor_class_sprintf.h
 rename src/accessor/{todo => }/grib_accessor_class_statistics.cc (55%)
 create mode 100644 src/accessor/grib_accessor_class_statistics.h
 create mode 100644 src/accessor/grib_accessor_class_statistics_spectral.cc
 create mode 100644 src/accessor/grib_accessor_class_statistics_spectral.h
 create mode 100644 src/accessor/grib_accessor_class_step_human_readable.cc
 create mode 100644 src/accessor/grib_accessor_class_step_human_readable.h
 rename src/accessor/{todo => }/grib_accessor_class_step_in_units.cc (63%)
 create mode 100644 src/accessor/grib_accessor_class_step_in_units.h
 create mode 100644 src/accessor/grib_accessor_class_sum.cc
 create mode 100644 src/accessor/grib_accessor_class_sum.h
 create mode 100644 src/accessor/grib_accessor_class_suppressed.cc
 create mode 100644 src/accessor/grib_accessor_class_suppressed.h
 create mode 100644 src/accessor/grib_accessor_class_time.cc
 create mode 100644 src/accessor/grib_accessor_class_time.h
 create mode 100644 src/accessor/grib_accessor_class_to_double.cc
 create mode 100644 src/accessor/grib_accessor_class_to_double.h
 create mode 100644 src/accessor/grib_accessor_class_to_integer.cc
 create mode 100644 src/accessor/grib_accessor_class_to_integer.h
 create mode 100644 src/accessor/grib_accessor_class_to_string.cc
 create mode 100644 src/accessor/grib_accessor_class_to_string.h
 create mode 100644 src/accessor/grib_accessor_class_transient_darray.cc
 create mode 100644 src/accessor/grib_accessor_class_transient_darray.h
 create mode 100644 src/accessor/grib_accessor_class_trim.cc
 create mode 100644 src/accessor/grib_accessor_class_trim.h
 create mode 100644 src/accessor/grib_accessor_class_uint16.cc
 create mode 100644 src/accessor/grib_accessor_class_uint16.h
 create mode 100644 src/accessor/grib_accessor_class_uint32.cc
 create mode 100644 src/accessor/grib_accessor_class_uint32.h
 create mode 100644 src/accessor/grib_accessor_class_uint32_little_endian.cc
 create mode 100644 src/accessor/grib_accessor_class_uint32_little_endian.h
 create mode 100644 src/accessor/grib_accessor_class_uint64.cc
 create mode 100644 src/accessor/grib_accessor_class_uint64.h
 create mode 100644 src/accessor/grib_accessor_class_uint64_little_endian.cc
 create mode 100644 src/accessor/grib_accessor_class_uint64_little_endian.h
 create mode 100644 src/accessor/grib_accessor_class_uint8.cc
 create mode 100644 src/accessor/grib_accessor_class_uint8.h
 create mode 100644 src/accessor/grib_accessor_class_unexpanded_descriptors.cc
 create mode 100644 src/accessor/grib_accessor_class_unexpanded_descriptors.h
 create mode 100644 src/accessor/grib_accessor_class_unpack_bufr_values.cc
 create mode 100644 src/accessor/grib_accessor_class_unpack_bufr_values.h
 create mode 100644 src/accessor/grib_accessor_class_unsigned_bits.cc
 create mode 100644 src/accessor/grib_accessor_class_unsigned_bits.h
 create mode 100644 src/accessor/grib_accessor_class_validity_date.cc
 create mode 100644 src/accessor/grib_accessor_class_validity_date.h
 create mode 100644 src/accessor/grib_accessor_class_validity_time.cc
 create mode 100644 src/accessor/grib_accessor_class_validity_time.h
 create mode 100644 src/accessor/grib_accessor_class_values.cc
 create mode 100644 src/accessor/grib_accessor_class_values.h
 create mode 100644 src/accessor/grib_accessor_class_vector.cc
 create mode 100644 src/accessor/grib_accessor_class_vector.h
 create mode 100644 src/accessor/grib_accessor_class_when.cc
 create mode 100644 src/accessor/grib_accessor_class_when.h
 delete mode 100644 src/accessor/todo/grib_accessor_class_abstract_long_vector.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_abstract_vector.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_ascii.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_bit.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_bitmap.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_bits_per_value.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_blob.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_budgdate.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_bufr_extract_subsets.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_bufr_group.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_bufr_simple_thinning.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_bufr_string_values.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_bufrdc_expanded_descriptors.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_bytes.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_change_alternative_row_scanning.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_check_internal_version.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_codeflag.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_codetable_title.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_codetable_units.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_count_file.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_count_total.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_data_dummy_field.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_data_g1complex_packing.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_data_g1secondary_bitmap.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_data_g1shsimple_packing.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_data_g2complex_packing.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_data_g2secondary_bitmap.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_data_g2shsimple_packing.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_data_g2simple_packing_with_preprocessing.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_data_raw_packing.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_data_secondary_bitmap.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_data_shsimple_packing.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_decimal_precision.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_dirty.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_divdouble.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_double.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_evaluate.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_g1_half_byte_codeflag.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_g1_section4_length.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_g1bitmap.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_g1day_of_the_year_date.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_g1end_of_interval_monthly.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_g1fcperiod.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_g1monthlydate.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_g1number_of_coded_values_sh_complex.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_g1number_of_coded_values_sh_simple.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_g1verificationdate.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_g2_aerosol.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_g2bitmap.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_g2bitmap_present.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_g2date.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_g2latlon.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_g2lon.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_gaussian_grid_name.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_gds_is_present.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_gds_not_present_bitmap.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_gen.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_getenv.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_group.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_gts_header.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_hash_array.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_headers_only.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_ibmfloat.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_ieeefloat.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_ifs_param.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_julian_day.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_ksec1expver.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_label.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_latlonvalues.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_library_version.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_long_vector.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_lookup.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_mars_param.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_mars_step.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_message.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_message_copy.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_multdouble.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_non_alpha.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_number_of_coded_values.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_number_of_points.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_number_of_values.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_number_of_values_data_raw_packing.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_octahedral_gaussian.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_octet_number.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_offset_file.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_offset_values.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_pack_bufr_values.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_packing_type.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_pad.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_padding.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_padto.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_padtoeven.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_padtomultiple.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_position.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_raw.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_rdbtime_guess_date.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_reference_value_error.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_round.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_scale.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_scale_values.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_section.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_section_length.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_section_padding.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_section_pointer.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_sexagesimal2decimal.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_signed_bits.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_simple_packing_error.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_size.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_smart_table_column.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_spd.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_spectral_truncation.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_statistics_spectral.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_step_human_readable.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_sum.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_suppressed.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_time.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_to_double.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_to_integer.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_to_string.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_transient_darray.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_trim.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_uint16.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_uint32.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_uint32_little_endian.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_uint64.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_uint64_little_endian.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_uint8.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_unexpanded_descriptors.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_unpack_bufr_values.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_unsigned_bits.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_validity_date.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_validity_time.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_values.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_vector.cc
 delete mode 100644 src/accessor/todo/grib_accessor_class_when.cc
 create mode 100644 src/shared_functions.cc
 create mode 100644 src/shared_functions.h

diff --git a/examples/C/grib_pthreads.c b/examples/C/grib_pthreads.c
index d9b23344c..eab0a5e74 100644
--- a/examples/C/grib_pthreads.c
+++ b/examples/C/grib_pthreads.c
@@ -51,7 +51,7 @@ static void* process_grib(void* threadID)
     ProductKind prod_kind = 0;
 
     codes_handle* h = codes_grib_handle_new_from_samples(0, "regular_ll_pl_grib2");
-    Assert(h);
+    Assert(h != NULL);
     CODES_CHECK(codes_get_product_kind(h, &prod_kind), 0);
     Assert(prod_kind == PRODUCT_GRIB);
     printf("Thread %ld running\n", tid);
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 53e2c3b1d..28e037c21 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,6 +12,7 @@ list( APPEND eccodes_src_files
     accessor/grib_accessor.cc
     accessor/grib_accessors_list.cc
     grib_accessor_class.cc
+    shared_functions.cc
     step_unit.cc
     step.cc
     step_utilities.cc
@@ -23,9 +24,9 @@ list( APPEND eccodes_src_files
     action_class_gen.cc
     action_class_if.cc
     action_class_switch.cc
-    #accessor/grib_accessor_class_g1fcperiod.cc
-    #accessor/grib_accessor_class_g1end_of_interval_monthly.cc
-    #accessor/grib_accessor_class_mars_param.cc
+    accessor/grib_accessor_class_g1fcperiod.cc
+    accessor/grib_accessor_class_g1end_of_interval_monthly.cc
+    accessor/grib_accessor_class_mars_param.cc
     action_class_section.cc
     action_class_list.cc
     action_class_while.cc
@@ -63,207 +64,207 @@ list( APPEND eccodes_src_files
     grib_viarray.cc
     codes_memfs.cc
     accessor/grib_accessor_class_gen.cc
-    #accessor/grib_accessor_class_ascii.cc
-    #accessor/grib_accessor_class_bit.cc
-    #accessor/grib_accessor_class_bitmap.cc
-    #accessor/grib_accessor_class_bits.cc
-    #accessor/grib_accessor_class_bits_per_value.cc
-    #accessor/grib_accessor_class_bufr_elements_table.cc
-    #accessor/grib_accessor_class_bufr_data_array.cc
-    #accessor/grib_accessor_class_bufr_data_element.cc
-    #accessor/grib_accessor_class_bufr_group.cc
-    #accessor/grib_accessor_class_bufr_string_values.cc
-    #accessor/grib_accessor_class_pack_bufr_values.cc
-    #accessor/grib_accessor_class_unpack_bufr_values.cc
-    #accessor/grib_accessor_class_group.cc
-    #accessor/grib_accessor_class_non_alpha.cc
-    #accessor/grib_accessor_class_g1bitmap.cc
-    #accessor/grib_accessor_class_g2bitmap.cc
-    #accessor/grib_accessor_class_concept.cc
-    #accessor/grib_accessor_class_hash_array.cc
-    #accessor/grib_accessor_class_decimal_precision.cc
-    #accessor/grib_accessor_class_divdouble.cc
-    #accessor/grib_accessor_class_multdouble.cc
-    #accessor/grib_accessor_class_budgdate.cc
-    #accessor/grib_accessor_class_validity_date.cc
-    #accessor/grib_accessor_class_validity_time.cc
-    #accessor/grib_accessor_class_bytes.cc
-    #accessor/grib_accessor_class_change_alternative_row_scanning.cc
-    #accessor/grib_accessor_class_change_scanning_direction.cc
-    #accessor/grib_accessor_class_check_internal_version.cc
-    #accessor/grib_accessor_class_codeflag.cc
+    accessor/grib_accessor_class_ascii.cc
+    accessor/grib_accessor_class_bit.cc
+    accessor/grib_accessor_class_bitmap.cc
+    accessor/grib_accessor_class_bits.cc
+    accessor/grib_accessor_class_bits_per_value.cc
+    accessor/grib_accessor_class_bufr_elements_table.cc
+    accessor/grib_accessor_class_bufr_data_array.cc
+    accessor/grib_accessor_class_bufr_data_element.cc
+    accessor/grib_accessor_class_bufr_group.cc
+    accessor/grib_accessor_class_bufr_string_values.cc
+    accessor/grib_accessor_class_pack_bufr_values.cc
+    accessor/grib_accessor_class_unpack_bufr_values.cc
+    accessor/grib_accessor_class_group.cc
+    accessor/grib_accessor_class_non_alpha.cc
+    accessor/grib_accessor_class_g1bitmap.cc
+    accessor/grib_accessor_class_g2bitmap.cc
+    accessor/grib_accessor_class_concept.cc
+    accessor/grib_accessor_class_hash_array.cc
+    accessor/grib_accessor_class_decimal_precision.cc
+    accessor/grib_accessor_class_divdouble.cc
+    accessor/grib_accessor_class_multdouble.cc
+    accessor/grib_accessor_class_budgdate.cc
+    accessor/grib_accessor_class_validity_date.cc
+    accessor/grib_accessor_class_validity_time.cc
+    accessor/grib_accessor_class_bytes.cc
+    accessor/grib_accessor_class_change_alternative_row_scanning.cc
+    accessor/grib_accessor_class_change_scanning_direction.cc
+    accessor/grib_accessor_class_check_internal_version.cc
+    accessor/grib_accessor_class_codeflag.cc
     accessor/grib_accessor_class_smart_table.cc
-    #accessor/grib_accessor_class_smart_table_column.cc
+    accessor/grib_accessor_class_smart_table_column.cc
     accessor/grib_accessor_class_codetable.cc
-    #accessor/grib_accessor_class_codetable_units.cc
-    #accessor/grib_accessor_class_codetable_title.cc
-    #accessor/grib_accessor_class_step_human_readable.cc
-    #accessor/grib_accessor_class_count_file.cc
-    #accessor/grib_accessor_class_count_total.cc
-    #accessor/grib_accessor_class_double.cc
-    #accessor/grib_accessor_class_element.cc
-    #accessor/grib_accessor_class_evaluate.cc
-    #accessor/grib_accessor_class_g1date.cc
-    #accessor/grib_accessor_class_g1monthlydate.cc
-    #accessor/grib_accessor_class_library_version.cc
-    #accessor/grib_accessor_class_when.cc
-    #accessor/grib_accessor_class_g1verificationdate.cc
-    #accessor/grib_accessor_class_g1day_of_the_year_date.cc
-    #accessor/grib_accessor_class_g1_half_byte_codeflag.cc
-    #accessor/grib_accessor_class_g1forecastmonth.cc
-    #accessor/grib_accessor_class_g1step_range.cc
-    #accessor/grib_accessor_class_g2step_range.cc
-    #accessor/grib_accessor_class_data_g22order_packing.cc
-    #accessor/grib_accessor_class_mars_step.cc
-    #accessor/grib_accessor_class_message_copy.cc
-    #accessor/grib_accessor_class_dictionary.cc
-    #accessor/grib_accessor_class_latlon_increment.cc
-    #accessor/grib_accessor_class_g2date.cc
-    #accessor/grib_accessor_class_g2level.cc
-    #accessor/grib_accessor_class_g2end_step.cc
-    #accessor/grib_accessor_class_g2latlon.cc
-    #accessor/grib_accessor_class_g2lon.cc
-    #accessor/grib_accessor_class_global_gaussian.cc
-    #accessor/grib_accessor_class_gaussian_grid_name.cc
-    #accessor/grib_accessor_class_gen.cc
-    #accessor/grib_accessor_class_getenv.cc
-    #accessor/grib_accessor_class_gts_header.cc
-    #accessor/grib_accessor_class_ifs_param.cc
-    #accessor/grib_accessor_class_julian_day.cc
-    #accessor/grib_accessor_class_julian_date.cc
-    #accessor/grib_accessor_class_closest_date.cc
-    #accessor/grib_accessor_class_latlonvalues.cc
-    #accessor/grib_accessor_class_latitudes.cc
-    #accessor/grib_accessor_class_longitudes.cc
-    #accessor/grib_accessor_class_offset_file.cc
-    #accessor/grib_accessor_class_scale.cc
-    #accessor/grib_accessor_class_from_scale_factor_scaled_value.cc
-    #accessor/grib_accessor_class_g2bitmap_present.cc
-    #accessor/grib_accessor_class_ibmfloat.cc
-    #accessor/grib_accessor_class_ieeefloat.cc
+    accessor/grib_accessor_class_codetable_units.cc
+    accessor/grib_accessor_class_codetable_title.cc
+    accessor/grib_accessor_class_step_human_readable.cc
+    accessor/grib_accessor_class_count_file.cc
+    accessor/grib_accessor_class_count_total.cc
+    accessor/grib_accessor_class_double.cc
+    accessor/grib_accessor_class_element.cc
+    accessor/grib_accessor_class_evaluate.cc
+    accessor/grib_accessor_class_g1date.cc
+    accessor/grib_accessor_class_g1monthlydate.cc
+    accessor/grib_accessor_class_library_version.cc
+    accessor/grib_accessor_class_when.cc
+    accessor/grib_accessor_class_g1verificationdate.cc
+    accessor/grib_accessor_class_g1day_of_the_year_date.cc
+    accessor/grib_accessor_class_g1_half_byte_codeflag.cc
+    accessor/grib_accessor_class_g1forecastmonth.cc
+    accessor/grib_accessor_class_g1step_range.cc
+    accessor/grib_accessor_class_g2step_range.cc
+    accessor/grib_accessor_class_data_g22order_packing.cc
+    accessor/grib_accessor_class_mars_step.cc
+    accessor/grib_accessor_class_message_copy.cc
+    accessor/grib_accessor_class_dictionary.cc
+    accessor/grib_accessor_class_latlon_increment.cc
+    accessor/grib_accessor_class_g2date.cc
+    accessor/grib_accessor_class_g2level.cc
+    accessor/grib_accessor_class_g2end_step.cc
+    accessor/grib_accessor_class_g2latlon.cc
+    accessor/grib_accessor_class_g2lon.cc
+    accessor/grib_accessor_class_global_gaussian.cc
+    accessor/grib_accessor_class_gaussian_grid_name.cc
+    accessor/grib_accessor_class_gen.cc
+    accessor/grib_accessor_class_getenv.cc
+    accessor/grib_accessor_class_gts_header.cc
+    accessor/grib_accessor_class_ifs_param.cc
+    accessor/grib_accessor_class_julian_day.cc
+    accessor/grib_accessor_class_julian_date.cc
+    accessor/grib_accessor_class_closest_date.cc
+    accessor/grib_accessor_class_latlonvalues.cc
+    accessor/grib_accessor_class_latitudes.cc
+    accessor/grib_accessor_class_longitudes.cc
+    accessor/grib_accessor_class_offset_file.cc
+    accessor/grib_accessor_class_scale.cc
+    accessor/grib_accessor_class_from_scale_factor_scaled_value.cc
+    accessor/grib_accessor_class_g2bitmap_present.cc
+    accessor/grib_accessor_class_ibmfloat.cc
+    accessor/grib_accessor_class_ieeefloat.cc
     accessor/grib_accessor_class_constant.cc
     accessor/grib_accessor_class_iterator.cc
-    #accessor/grib_accessor_class_message.cc
+    accessor/grib_accessor_class_message.cc
     accessor/grib_accessor_class_nearest.cc
-    #accessor/grib_accessor_class_ksec1expver.cc
-    #accessor/grib_accessor_class_label.cc
+    accessor/grib_accessor_class_ksec1expver.cc
+    accessor/grib_accessor_class_label.cc
     accessor/grib_accessor_class_long.cc
-    #accessor/grib_accessor_class_lookup.cc
-    #accessor/grib_accessor_class_octahedral_gaussian.cc
-    #accessor/grib_accessor_class_octet_number.cc
-    #accessor/grib_accessor_class_headers_only.cc
-    #accessor/grib_accessor_class_padding.cc
-    #accessor/grib_accessor_class_pad.cc
-    #accessor/grib_accessor_class_padto.cc
-    #accessor/grib_accessor_class_padtoeven.cc
-    #accessor/grib_accessor_class_padtomultiple.cc
-    #accessor/grib_accessor_class_section_padding.cc
-    #accessor/grib_accessor_class_packing_type.cc
-    #accessor/grib_accessor_class_section_pointer.cc
-    #accessor/grib_accessor_class_position.cc
-    #accessor/grib_accessor_class_signed.cc
-    #accessor/grib_accessor_class_signed_bits.cc
-    #accessor/grib_accessor_class_section.cc
-    #accessor/grib_accessor_class_step_in_units.cc
-    #accessor/grib_accessor_class_optimal_step_units.cc
-    #accessor/grib_accessor_class_section_length.cc
-    #accessor/grib_accessor_class_g1_message_length.cc
-    #accessor/grib_accessor_class_g1_section4_length.cc
-    #accessor/grib_accessor_class_size.cc
-    #accessor/grib_accessor_class_rdbtime_guess_date.cc
-    #accessor/grib_accessor_class_scale_values.cc
-    #accessor/grib_accessor_class_offset_values.cc
-    #accessor/grib_accessor_class_sprintf.cc
-    #accessor/grib_accessor_class_round.cc
-    #accessor/grib_accessor_class_spectral_truncation.cc
-    #accessor/grib_accessor_class_time.cc
+    accessor/grib_accessor_class_lookup.cc
+    accessor/grib_accessor_class_octahedral_gaussian.cc
+    accessor/grib_accessor_class_octet_number.cc
+    accessor/grib_accessor_class_headers_only.cc
+    accessor/grib_accessor_class_padding.cc
+    accessor/grib_accessor_class_pad.cc
+    accessor/grib_accessor_class_padto.cc
+    accessor/grib_accessor_class_padtoeven.cc
+    accessor/grib_accessor_class_padtomultiple.cc
+    accessor/grib_accessor_class_section_padding.cc
+    accessor/grib_accessor_class_packing_type.cc
+    accessor/grib_accessor_class_section_pointer.cc
+    accessor/grib_accessor_class_position.cc
+    accessor/grib_accessor_class_signed.cc
+    accessor/grib_accessor_class_signed_bits.cc
+    accessor/grib_accessor_class_section.cc
+    accessor/grib_accessor_class_step_in_units.cc
+    accessor/grib_accessor_class_optimal_step_units.cc
+    accessor/grib_accessor_class_section_length.cc
+    accessor/grib_accessor_class_g1_message_length.cc
+    accessor/grib_accessor_class_g1_section4_length.cc
+    accessor/grib_accessor_class_size.cc
+    accessor/grib_accessor_class_rdbtime_guess_date.cc
+    accessor/grib_accessor_class_scale_values.cc
+    accessor/grib_accessor_class_offset_values.cc
+    accessor/grib_accessor_class_sprintf.cc
+    accessor/grib_accessor_class_round.cc
+    accessor/grib_accessor_class_spectral_truncation.cc
+    accessor/grib_accessor_class_time.cc
     accessor/grib_accessor_class_transient.cc
-    #accessor/grib_accessor_class_trim.cc
-    #accessor/grib_accessor_class_transient_darray.cc
-    #accessor/grib_accessor_class_values.cc
-    #accessor/grib_accessor_class_simple_packing_error.cc
-    #accessor/grib_accessor_class_data_simple_packing.cc
-    #accessor/grib_accessor_class_count_missing.cc
-    #accessor/grib_accessor_class_data_sh_packed.cc
-    #accessor/grib_accessor_class_data_sh_unpacked.cc
-    #accessor/grib_accessor_class_number_of_values_data_raw_packing.cc
-    #accessor/grib_accessor_class_data_g1simple_packing.cc
-    #accessor/grib_accessor_class_data_g1shsimple_packing.cc
-    #accessor/grib_accessor_class_data_shsimple_packing.cc
-    #accessor/grib_accessor_class_data_dummy_field.cc
+    accessor/grib_accessor_class_trim.cc
+    accessor/grib_accessor_class_transient_darray.cc
+    accessor/grib_accessor_class_values.cc
+    accessor/grib_accessor_class_simple_packing_error.cc
+    accessor/grib_accessor_class_data_simple_packing.cc
+    accessor/grib_accessor_class_count_missing.cc
+    accessor/grib_accessor_class_data_sh_packed.cc
+    accessor/grib_accessor_class_data_sh_unpacked.cc
+    accessor/grib_accessor_class_number_of_values_data_raw_packing.cc
+    accessor/grib_accessor_class_data_g1simple_packing.cc
+    accessor/grib_accessor_class_data_g1shsimple_packing.cc
+    accessor/grib_accessor_class_data_shsimple_packing.cc
+    accessor/grib_accessor_class_data_dummy_field.cc
     accessor/grib_accessor_class_variable.cc
-    #accessor/grib_accessor_class_second_order_bits_per_value.cc
-    #accessor/grib_accessor_class_data_g2simple_packing.cc
-    #accessor/grib_accessor_class_data_g2simple_packing_with_preprocessing.cc
-    #accessor/grib_accessor_class_data_g2shsimple_packing.cc
-    #accessor/grib_accessor_class_data_g2complex_packing.cc
-    #accessor/grib_accessor_class_data_g1second_order_row_by_row_packing.cc
-    #accessor/grib_accessor_class_data_g1second_order_constant_width_packing.cc
-    #accessor/grib_accessor_class_data_g1second_order_general_packing.cc
-    #accessor/grib_accessor_class_data_g1second_order_general_extended_packing.cc
-    #accessor/grib_accessor_class_g2grid.cc
-    #accessor/grib_accessor_class_unexpanded_descriptors.cc
-    #accessor/grib_accessor_class_expanded_descriptors.cc
-    #accessor/grib_accessor_class_bufrdc_expanded_descriptors.cc
-    #accessor/grib_accessor_class_data_apply_bitmap.cc
-    #accessor/grib_accessor_class_data_apply_boustrophedonic.cc
-    #accessor/grib_accessor_class_data_apply_boustrophedonic_bitmap.cc
-    #accessor/grib_accessor_class_data_secondary_bitmap.cc
-    #accessor/grib_accessor_class_data_g1secondary_bitmap.cc
-    #accessor/grib_accessor_class_data_g2secondary_bitmap.cc
-    #accessor/grib_accessor_class_data_jpeg2000_packing.cc
-    #accessor/grib_accessor_class_data_png_packing.cc
-    #accessor/grib_accessor_class_data_ccsds_packing.cc
-    #accessor/grib_accessor_class_data_raw_packing.cc
-    #accessor/grib_accessor_class_data_complex_packing.cc
-    #accessor/grib_accessor_class_data_g1complex_packing.cc
-    #accessor/grib_accessor_class_gds_not_present_bitmap.cc
-    #accessor/grib_accessor_class_gds_is_present.cc
-    #accessor/grib_accessor_class_select_step_template.cc
-    #accessor/grib_accessor_class_local_definition.cc
-    #accessor/grib_accessor_class_g2_eps.cc
-    #accessor/grib_accessor_class_g2_aerosol.cc
-    #accessor/grib_accessor_class_g2_chemical.cc
-    #accessor/grib_accessor_class_g2_mars_labeling.cc
-    #accessor/grib_accessor_class_md5.cc
-    #accessor/grib_accessor_class_proj_string.cc
+    accessor/grib_accessor_class_second_order_bits_per_value.cc
+    accessor/grib_accessor_class_data_g2simple_packing.cc
+    accessor/grib_accessor_class_data_g2simple_packing_with_preprocessing.cc
+    accessor/grib_accessor_class_data_g2shsimple_packing.cc
+    accessor/grib_accessor_class_data_g2complex_packing.cc
+    accessor/grib_accessor_class_data_g1second_order_row_by_row_packing.cc
+    accessor/grib_accessor_class_data_g1second_order_constant_width_packing.cc
+    accessor/grib_accessor_class_data_g1second_order_general_packing.cc
+    accessor/grib_accessor_class_data_g1second_order_general_extended_packing.cc
+    accessor/grib_accessor_class_g2grid.cc
+    accessor/grib_accessor_class_unexpanded_descriptors.cc
+    accessor/grib_accessor_class_expanded_descriptors.cc
+    accessor/grib_accessor_class_bufrdc_expanded_descriptors.cc
+    accessor/grib_accessor_class_data_apply_bitmap.cc
+    accessor/grib_accessor_class_data_apply_boustrophedonic.cc
+    accessor/grib_accessor_class_data_apply_boustrophedonic_bitmap.cc
+    accessor/grib_accessor_class_data_secondary_bitmap.cc
+    accessor/grib_accessor_class_data_g1secondary_bitmap.cc
+    accessor/grib_accessor_class_data_g2secondary_bitmap.cc
+    accessor/grib_accessor_class_data_jpeg2000_packing.cc
+    accessor/grib_accessor_class_data_png_packing.cc
+    accessor/grib_accessor_class_data_ccsds_packing.cc
+    accessor/grib_accessor_class_data_raw_packing.cc
+    accessor/grib_accessor_class_data_complex_packing.cc
+    accessor/grib_accessor_class_data_g1complex_packing.cc
+    accessor/grib_accessor_class_gds_not_present_bitmap.cc
+    accessor/grib_accessor_class_gds_is_present.cc
+    accessor/grib_accessor_class_select_step_template.cc
+    accessor/grib_accessor_class_local_definition.cc
+    accessor/grib_accessor_class_g2_eps.cc
+    accessor/grib_accessor_class_g2_aerosol.cc
+    accessor/grib_accessor_class_g2_chemical.cc
+    accessor/grib_accessor_class_g2_mars_labeling.cc
+    accessor/grib_accessor_class_md5.cc
+    accessor/grib_accessor_class_proj_string.cc
     grib_jasper_encoding.cc
     grib_openjpeg_encoding.cc
     action_class_set_missing.cc
-    #accessor/grib_accessor_class_number_of_points.cc
-    #accessor/grib_accessor_class_suppressed.cc
+    accessor/grib_accessor_class_number_of_points.cc
+    accessor/grib_accessor_class_suppressed.cc
     grib_index.cc
-    #accessor/grib_accessor_class_number_of_points_gaussian.cc
-    #accessor/grib_accessor_class_number_of_values.cc
-    #accessor/grib_accessor_class_number_of_coded_values.cc
-    #accessor/grib_accessor_class_g1number_of_coded_values_sh_complex.cc
-    #accessor/grib_accessor_class_g1number_of_coded_values_sh_simple.cc
-    #accessor/grib_accessor_class_dirty.cc
-    #accessor/grib_accessor_class_statistics.cc
-    #accessor/grib_accessor_class_statistics_spectral.cc
+    accessor/grib_accessor_class_number_of_points_gaussian.cc
+    accessor/grib_accessor_class_number_of_values.cc
+    accessor/grib_accessor_class_number_of_coded_values.cc
+    accessor/grib_accessor_class_g1number_of_coded_values_sh_complex.cc
+    accessor/grib_accessor_class_g1number_of_coded_values_sh_simple.cc
+    accessor/grib_accessor_class_dirty.cc
+    accessor/grib_accessor_class_statistics.cc
+    accessor/grib_accessor_class_statistics_spectral.cc
     accessor/grib_accessor_class_unsigned.cc
-    #accessor/grib_accessor_class_unsigned_bits.cc
-    #accessor/grib_accessor_class_raw.cc
-    #accessor/grib_accessor_class_bufr_simple_thinning.cc
-    #accessor/grib_accessor_class_bufr_extract_subsets.cc
-    #accessor/grib_accessor_class_bufr_extract_area_subsets.cc
-    #accessor/grib_accessor_class_bufr_extract_datetime_subsets.cc
-    #accessor/grib_accessor_class_spd.cc
-    #accessor/grib_accessor_class_sum.cc
-    #accessor/grib_accessor_class_to_integer.cc
-    #accessor/grib_accessor_class_to_double.cc
-    #accessor/grib_accessor_class_to_string.cc
-    #accessor/grib_accessor_class_sexagesimal2decimal.cc
-    #accessor/grib_accessor_class_vector.cc
-    #accessor/grib_accessor_class_long_vector.cc
+    accessor/grib_accessor_class_unsigned_bits.cc
+    accessor/grib_accessor_class_raw.cc
+    accessor/grib_accessor_class_bufr_simple_thinning.cc
+    accessor/grib_accessor_class_bufr_extract_subsets.cc
+    accessor/grib_accessor_class_bufr_extract_area_subsets.cc
+    accessor/grib_accessor_class_bufr_extract_datetime_subsets.cc
+    accessor/grib_accessor_class_spd.cc
+    accessor/grib_accessor_class_sum.cc
+    accessor/grib_accessor_class_to_integer.cc
+    accessor/grib_accessor_class_to_double.cc
+    accessor/grib_accessor_class_to_string.cc
+    accessor/grib_accessor_class_sexagesimal2decimal.cc
+    accessor/grib_accessor_class_vector.cc
+    accessor/grib_accessor_class_long_vector.cc
     grib_gaussian_reduced.cc
-    #accessor/grib_accessor_class_abstract_vector.cc
-    #accessor/grib_accessor_class_abstract_long_vector.cc
+    accessor/grib_accessor_class_abstract_vector.cc
+    accessor/grib_accessor_class_abstract_long_vector.cc
     grib_loader_from_handle.cc
     grib_bits.cc
     grib_ibmfloat.cc
     grib_ieeefloat.cc
-    #accessor/grib_accessor_class_reference_value_error.cc
+    accessor/grib_accessor_class_reference_value_error.cc
     grib_memory.cc
     grib_buffer.cc
     grib_dumper.cc
@@ -366,16 +367,16 @@ list( APPEND eccodes_src_files
     grib_yacc.h
     md5.h
     md5.cc
-    #accessor/grib_accessor_class_uint16.cc
-    #accessor/grib_accessor_class_uint32.cc
-    #accessor/grib_accessor_class_uint32_little_endian.cc
-    #accessor/grib_accessor_class_uint64.cc
-    #accessor/grib_accessor_class_uint64_little_endian.cc
-    #accessor/grib_accessor_class_uint8.cc
-    #accessor/grib_accessor_class_blob.cc
+    accessor/grib_accessor_class_uint16.cc
+    accessor/grib_accessor_class_uint32.cc
+    accessor/grib_accessor_class_uint32_little_endian.cc
+    accessor/grib_accessor_class_uint64.cc
+    accessor/grib_accessor_class_uint64_little_endian.cc
+    accessor/grib_accessor_class_uint8.cc
+    accessor/grib_accessor_class_blob.cc
     grib_optimize_decimal_factor.cc
-    #accessor/grib_accessor_class_data_g2bifourier_packing.cc
-    #accessor/grib_accessor_class_data_run_length_packing.cc
+    accessor/grib_accessor_class_data_g2bifourier_packing.cc
+    accessor/grib_accessor_class_data_run_length_packing.cc
     eccodes_windef.h
     # We ship our own generated lex/yacc C files
     grib_yacc.cc  grib_lex.cc )
diff --git a/src/accessor/grib_accessor_class_abstract_long_vector.cc b/src/accessor/grib_accessor_class_abstract_long_vector.cc
new file mode 100644
index 000000000..ad0740841
--- /dev/null
+++ b/src/accessor/grib_accessor_class_abstract_long_vector.cc
@@ -0,0 +1,17 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_abstract_long_vector.h"
+
+grib_accessor_class_abstract_long_vector_t _grib_accessor_class_abstract_long_vector{"abstract_long_vector"};
+grib_accessor_class* grib_accessor_class_abstract_long_vector = &_grib_accessor_class_abstract_long_vector;
+
diff --git a/src/accessor/grib_accessor_class_abstract_long_vector.h b/src/accessor/grib_accessor_class_abstract_long_vector.h
new file mode 100644
index 000000000..2961979d8
--- /dev/null
+++ b/src/accessor/grib_accessor_class_abstract_long_vector.h
@@ -0,0 +1,33 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_abstract_long_vector_h
+#define eccodes_accessor_abstract_long_vector_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_abstract_long_vector_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in abstract_long_vector */
+    long* v;
+    long pack_index;
+    int number_of_elements;
+};
+
+class grib_accessor_class_abstract_long_vector_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_abstract_long_vector_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_abstract_long_vector_t{}; }
+};
+#endif /* eccodes_accessor_abstract_long_vector_h */
diff --git a/src/accessor/grib_accessor_class_abstract_vector.cc b/src/accessor/grib_accessor_class_abstract_vector.cc
new file mode 100644
index 000000000..692e9c404
--- /dev/null
+++ b/src/accessor/grib_accessor_class_abstract_vector.cc
@@ -0,0 +1,17 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_abstract_vector.h"
+
+grib_accessor_class_abstract_vector_t _grib_accessor_class_abstract_vector{"abstract_vector"};
+grib_accessor_class* grib_accessor_class_abstract_vector = &_grib_accessor_class_abstract_vector;
+
diff --git a/src/accessor/grib_accessor_class_abstract_vector.h b/src/accessor/grib_accessor_class_abstract_vector.h
new file mode 100644
index 000000000..df7e3fdbf
--- /dev/null
+++ b/src/accessor/grib_accessor_class_abstract_vector.h
@@ -0,0 +1,32 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_abstract_vector_h
+#define eccodes_accessor_abstract_vector_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_double.h"
+
+class grib_accessor_abstract_vector_t : public grib_accessor_double_t
+{
+public:
+    /* Members defined in abstract_vector */
+    double* v;
+    int number_of_elements;
+};
+
+class grib_accessor_class_abstract_vector_t : public grib_accessor_class_double_t
+{
+public:
+    grib_accessor_class_abstract_vector_t(const char* name) : grib_accessor_class_double_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_abstract_vector_t{}; }
+};
+#endif /* eccodes_accessor_abstract_vector_h */
diff --git a/src/accessor/grib_accessor_class_ascii.cc b/src/accessor/grib_accessor_class_ascii.cc
new file mode 100644
index 000000000..4fedc7c60
--- /dev/null
+++ b/src/accessor/grib_accessor_class_ascii.cc
@@ -0,0 +1,164 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_ascii.h"
+
+grib_accessor_class_ascii_t _grib_accessor_class_ascii{"ascii"};
+grib_accessor_class* grib_accessor_class_ascii = &_grib_accessor_class_ascii;
+
+
+void grib_accessor_class_ascii_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    a->length = len;
+    Assert(a->length >= 0);
+}
+
+int grib_accessor_class_ascii_t::value_count(grib_accessor* a, long* count){
+    *count = 1;
+    return 0;
+}
+
+size_t grib_accessor_class_ascii_t::string_length(grib_accessor* a){
+    return a->length;
+}
+
+void grib_accessor_class_ascii_t::dump(grib_accessor* a, grib_dumper* dumper){
+    grib_dump_string(dumper, a, NULL);
+}
+
+int grib_accessor_class_ascii_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_STRING;
+}
+
+int grib_accessor_class_ascii_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    size_t i = 0;
+    grib_handle* hand = grib_handle_of_accessor(a);
+    const size_t alen = a->length;
+
+    if (*len < (alen + 1)) {
+        const char* cclass_name = a->cclass->name;
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
+                         cclass_name, a->name, alen+1, *len);
+        *len = alen + 1;
+        return GRIB_BUFFER_TOO_SMALL;
+    }
+
+    for (i = 0; i < alen; i++)
+        val[i] = hand->buffer->data[a->offset + i];
+    val[i] = 0;
+    *len = i;
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_ascii_t::pack_string(grib_accessor* a, const char* val, size_t* len){
+    size_t i = 0;
+    grib_handle* hand = grib_handle_of_accessor(a);
+    const size_t alen = a->length;
+    if (len[0] > (alen + 1)) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                "pack_string: Wrong size (%zu) for %s, it contains %ld values", len[0], a->name, a->length + 1);
+        len[0] = 0;
+        return GRIB_BUFFER_TOO_SMALL;
+    }
+
+    for (i = 0; i < alen; i++) {
+        if (i < len[0])
+            hand->buffer->data[a->offset + i] = val[i];
+        else
+            hand->buffer->data[a->offset + i] = 0;
+    }
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_ascii_t::pack_long(grib_accessor* a, const long* v, size_t* len){
+    grib_context_log(a->context, GRIB_LOG_ERROR, "Should not pack %s as long (It's a string)", a->name);
+    return GRIB_NOT_IMPLEMENTED;
+}
+
+int grib_accessor_class_ascii_t::pack_double(grib_accessor* a, const double* v, size_t* len){
+    grib_context_log(a->context, GRIB_LOG_ERROR, "Should not pack %s as double (It's a string)", a->name);
+    return GRIB_NOT_IMPLEMENTED;
+}
+
+int grib_accessor_class_ascii_t::unpack_long(grib_accessor* a, long* v, size_t* len){
+    char val[1024] = {0,};
+    size_t l   = sizeof(val);
+    size_t i   = 0;
+    char* last = NULL;
+    int err    = a->unpack_string(val, &l);
+    if (err)
+        return err;
+
+    i = 0;
+    while (i < l - 1 && val[i] == ' ')
+        i++;
+
+    if (val[i] == 0) {
+        *v = 0;
+        return 0;
+    }
+    if (val[i + 1] == ' ' && i < l - 2)
+        val[i + 1] = 0;
+
+    *v = strtol(val, &last, 10);
+
+    grib_context_log(a->context, GRIB_LOG_DEBUG, " Casting string %s to long", a->name);
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_ascii_t::unpack_double(grib_accessor* a, double* v, size_t* len){
+    char val[1024];
+    size_t l   = sizeof(val);
+    char* last = NULL;
+
+    int err = a->unpack_string(val, &l);    if (err) return err;
+
+    *v = strtod(val, &last);
+
+    if (*last == 0) {
+        grib_context_log(a->context, GRIB_LOG_DEBUG, " Casting string %s to long", a->name);
+        return GRIB_SUCCESS;
+    }
+
+    grib_context_log(a->context, GRIB_LOG_WARNING, "Cannot unpack %s as double. Hint: Try unpacking as string", a->name);
+
+    return GRIB_NOT_IMPLEMENTED;
+}
+
+int grib_accessor_class_ascii_t::compare(grib_accessor* a, grib_accessor* b){
+    int retval = 0;
+    char* aval = 0;
+    char* bval = 0;
+    int err    = 0;
+
+    size_t alen = a->length+1;
+    size_t blen = b->length+1;
+
+    if (alen != blen)
+        return GRIB_COUNT_MISMATCH;
+
+    aval = (char*)grib_context_malloc(a->context, alen * sizeof(char));
+    bval = (char*)grib_context_malloc(b->context, blen * sizeof(char));
+
+    err = a->unpack_string(aval, &alen);    if (err) return err;
+    err = b->unpack_string(bval, &blen);    if (err) return err;
+
+    retval = GRIB_SUCCESS;
+    if (!STR_EQUAL(aval, bval))
+        retval = GRIB_STRING_VALUE_MISMATCH;
+
+    grib_context_free(a->context, aval);
+    grib_context_free(b->context, bval);
+
+    return retval;
+}
diff --git a/src/accessor/grib_accessor_class_ascii.h b/src/accessor/grib_accessor_class_ascii.h
new file mode 100644
index 000000000..cb8e68bd7
--- /dev/null
+++ b/src/accessor/grib_accessor_class_ascii.h
@@ -0,0 +1,42 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_ascii_h
+#define eccodes_accessor_ascii_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_ascii_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in ascii */
+};
+
+class grib_accessor_class_ascii_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_ascii_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_ascii_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int pack_string(grib_accessor*, const char*, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    size_t string_length(grib_accessor*) override;
+    int value_count(grib_accessor*, long*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    int compare(grib_accessor*, grib_accessor*) override;
+};
+#endif /* eccodes_accessor_ascii_h */
diff --git a/src/accessor/grib_accessor_class_bit.cc b/src/accessor/grib_accessor_class_bit.cc
new file mode 100644
index 000000000..2cf31bd48
--- /dev/null
+++ b/src/accessor/grib_accessor_class_bit.cc
@@ -0,0 +1,79 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_bit.h"
+
+grib_accessor_class_bit_t _grib_accessor_class_bit{"bit"};
+grib_accessor_class* grib_accessor_class_bit = &_grib_accessor_class_bit;
+
+
+void grib_accessor_class_bit_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    grib_accessor_bit_t* self = (grib_accessor_bit_t*)a;
+    a->length       = 0;
+    self->owner     = grib_arguments_get_name(grib_handle_of_accessor(a), arg, 0);
+    self->bit_index = grib_arguments_get_long(grib_handle_of_accessor(a), arg, 1);
+}
+
+int grib_accessor_class_bit_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_bit_t* self = (grib_accessor_bit_t*)a;
+    int ret = 0;
+    long data = 0;
+
+    if (*len < 1) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "grib_accessor_bit_t: unpack_long: Wrong size for %s, it contains %d values ", a->name, 1);
+        *len = 1;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->owner, &data)) != GRIB_SUCCESS) {
+        *len = 0;
+        return ret;
+    }
+
+    if (data & (1 << self->bit_index))
+        *val = 1;
+    else
+        *val = 0;
+
+    *len = 1;
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_bit_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_bit_t* self = (grib_accessor_bit_t*)a;
+
+    if (*len < 1) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "grib_accessor_bit_t: pack_long: At least one value to pack for %s", a->name);
+        *len = 1;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    grib_accessor* owner = grib_find_accessor(grib_handle_of_accessor(a), self->owner);
+    if (!owner) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "grib_accessor_bit_t: Cannot get the owner %s for computing the bit value of %s",
+                        self->owner, a->name);
+        *len = 0;
+        return GRIB_NOT_FOUND;
+    }
+
+    unsigned char* mdata = grib_handle_of_accessor(a)->buffer->data;
+    mdata += owner->byte_offset();
+    /* Note: In the definitions, flagbit numbers go from 7 to 0 (the bit_index), while WMO convention is from 1 to 8 */
+    if (a->context->debug) {
+        /* Print bit positions from 1 (MSB) */
+        fprintf(stderr, "ECCODES DEBUG Setting bit %d in %s to %d\n", 8 - self->bit_index, owner->name, (*val > 0) );
+    }
+    grib_set_bit(mdata, 7 - self->bit_index, *val > 0);
+
+    *len = 1;
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_bit.h b/src/accessor/grib_accessor_class_bit.h
new file mode 100644
index 000000000..3a9eee2d7
--- /dev/null
+++ b/src/accessor/grib_accessor_class_bit.h
@@ -0,0 +1,35 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_bit_h
+#define eccodes_accessor_bit_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_bit_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in bit */
+    const char* owner;
+    int bit_index;
+};
+
+class grib_accessor_class_bit_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_bit_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_bit_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_bit_h */
diff --git a/src/accessor/grib_accessor_class_bitmap.cc b/src/accessor/grib_accessor_class_bitmap.cc
new file mode 100644
index 000000000..eb45c4464
--- /dev/null
+++ b/src/accessor/grib_accessor_class_bitmap.cc
@@ -0,0 +1,175 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_bitmap.h"
+
+grib_accessor_class_bitmap_t _grib_accessor_class_bitmap{"bitmap"};
+grib_accessor_class* grib_accessor_class_bitmap = &_grib_accessor_class_bitmap;
+
+
+
+void compute_size(grib_accessor* a){
+    long slen         = 0;
+    long off          = 0;
+    grib_handle* hand = grib_handle_of_accessor(a);
+
+    grib_accessor_bitmap_t* self = (grib_accessor_bitmap_t*)a;
+    grib_get_long_internal(hand, self->offsetbsec, &off);
+    grib_get_long_internal(hand, self->sLength, &slen);
+
+    if (slen == 0) {
+        grib_accessor* seclen;
+        size_t size;
+        /* Assume reparsing */
+        Assert(hand->loader != 0);
+        if (hand->loader != 0) {
+            seclen = grib_find_accessor(hand, self->sLength);
+            Assert(seclen);
+            grib_get_block_length(seclen->parent, &size);
+            slen = size;
+        }
+    }
+
+    // printf("compute_size off=%ld slen=%ld a->offset=%ld\n", (long)off,(long)slen,(long)a->offset);
+
+    a->length = off + (slen - a->offset);
+
+    if (a->length < 0) {
+        /* Assume reparsing */
+        /*Assert(hand->loader != 0);*/
+        a->length = 0;
+    }
+
+    Assert(a->length >= 0);
+}
+
+void grib_accessor_class_bitmap_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    grib_accessor_bitmap_t* self = (grib_accessor_bitmap_t*)a;
+    grib_handle* hand = grib_handle_of_accessor(a);
+    int n = 0;
+
+    self->tableReference = grib_arguments_get_name(hand, arg, n++);
+    self->missing_value  = grib_arguments_get_name(hand, arg, n++);
+    self->offsetbsec     = grib_arguments_get_name(hand, arg, n++);
+    self->sLength        = grib_arguments_get_name(hand, arg, n++);
+
+    compute_size(a);
+}
+
+long grib_accessor_class_bitmap_t::next_offset(grib_accessor* a){
+    return a->byte_offset() + a->byte_count();}
+
+void grib_accessor_class_bitmap_t::dump(grib_accessor* a, grib_dumper* dumper){
+    long len = 0;
+    char label[1024];
+
+    a->value_count(&len);
+    snprintf(label, 1024, "Bitmap of %ld values", len);
+    grib_dump_bytes(dumper, a, label);
+}
+
+int grib_accessor_class_bitmap_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    long pos  = a->offset * 8;
+    long tlen = 0;
+    const grib_handle* hand = grib_handle_of_accessor(a);
+
+    int err = a->value_count(&tlen);    if (err)
+        return err;
+
+    if (*len < tlen) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s, it contains %ld values", a->name, tlen);
+        *len = tlen;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    for (long i = 0; i < tlen; i++) {
+        val[i] = (long)grib_decode_unsigned_long(hand->buffer->data, &pos, 1);
+    }
+    *len = tlen;
+    return GRIB_SUCCESS;
+}
+
+template <typename T>
+int unpack(grib_accessor* a, T* val, size_t* len){
+    static_assert(std::is_floating_point<T>::value, "Requires floating points numbers");
+    long pos = a->offset * 8;
+    long tlen;
+    grib_handle* hand = grib_handle_of_accessor(a);
+
+    int err = a->value_count(&tlen);    if (err)
+        return err;
+
+    if (*len < tlen) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s, it contains %ld values", a->name, tlen);
+        *len = tlen;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    for (long i = 0; i < tlen; i++) {
+        val[i] = (T)grib_decode_unsigned_long(hand->buffer->data, &pos, 1);
+    }
+    *len = tlen;
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_bitmap_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    return unpack<double>(a, val, len);
+}
+
+int grib_accessor_class_bitmap_t::unpack_float(grib_accessor* a, float* val, size_t* len){
+    return unpack<float>(a, val, len);
+}
+
+int grib_accessor_class_bitmap_t::unpack_double_element(grib_accessor* a, size_t idx, double* val){
+    long pos = a->offset * 8;
+
+    pos += idx;
+    *val = (double)grib_decode_unsigned_long(grib_handle_of_accessor(a)->buffer->data, &pos, 1);
+
+    return GRIB_SUCCESS;
+}
+int grib_accessor_class_bitmap_t::unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array){
+    for (size_t i=0; i<len; ++i) {
+        unpack_double_element(a, index_array[i], val_array + i);
+    }
+    return GRIB_SUCCESS;
+}
+
+void grib_accessor_class_bitmap_t::update_size(grib_accessor* a, size_t s){
+    a->length = s;
+}
+
+size_t grib_accessor_class_bitmap_t::string_length(grib_accessor* a){
+    return a->length;
+}
+
+int grib_accessor_class_bitmap_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    grib_handle* hand = grib_handle_of_accessor(a);
+    const size_t l = a->length;
+
+    if (*len < l) {
+        const char* cclass_name = a->cclass->name;
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
+                         cclass_name, a->name, l, *len);
+        *len = l;
+        return GRIB_BUFFER_TOO_SMALL;
+    }
+
+    for (long i = 0; i < a->length; i++) {
+        val[i] = hand->buffer->data[a->offset + i];
+    }
+
+    *len = a->length;
+
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_bitmap.h b/src/accessor/grib_accessor_class_bitmap.h
new file mode 100644
index 000000000..d9b3ab9df
--- /dev/null
+++ b/src/accessor/grib_accessor_class_bitmap.h
@@ -0,0 +1,45 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_bitmap_h
+#define eccodes_accessor_bitmap_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_bytes.h"
+
+class grib_accessor_bitmap_t : public grib_accessor_bytes_t
+{
+public:
+    /* Members defined in bitmap */
+    const char* tableReference;
+    const char* missing_value;
+    const char* offsetbsec;
+    const char* sLength;
+};
+
+class grib_accessor_class_bitmap_t : public grib_accessor_class_bytes_t
+{
+public:
+    grib_accessor_class_bitmap_t(const char* name) : grib_accessor_class_bytes_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_bitmap_t{}; }
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_float(grib_accessor*, float* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    size_t string_length(grib_accessor*) override;
+    long next_offset(grib_accessor*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    void update_size(grib_accessor*, size_t) override;
+    int unpack_double_element(grib_accessor*, size_t i, double* val) override;
+    int unpack_double_element_set(grib_accessor*, const size_t* index_array, size_t len, double* val_array) override;
+};
+#endif /* eccodes_accessor_bitmap_h */
diff --git a/src/accessor/todo/grib_accessor_class_bits.cc b/src/accessor/grib_accessor_class_bits.cc
similarity index 51%
rename from src/accessor/todo/grib_accessor_class_bits.cc
rename to src/accessor/grib_accessor_class_bits.cc
index 5e86e2fef..b38de626c 100644
--- a/src/accessor/todo/grib_accessor_class_bits.cc
+++ b/src/accessor/grib_accessor_class_bits.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,127 +9,15 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-/**************************************
- *  Enrico Fucile
- **************************************/
-
-
 #include "grib_api_internal.h"
+#include "grib_accessor_class_bits.h"
 
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = get_native_type
-   IMPLEMENTS = unpack_long; pack_long
-   IMPLEMENTS = unpack_bytes; byte_count
-   IMPLEMENTS = unpack_double; pack_double
-   IMPLEMENTS = unpack_string
-   IMPLEMENTS = init
-   MEMBERS=const char*    argument
-   MEMBERS=long    start
-   MEMBERS=long    len
-   MEMBERS=double referenceValue
-   MEMBERS=double referenceValuePresent
-   MEMBERS=double scale
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_bytes(grib_accessor*, unsigned char*, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static long byte_count(grib_accessor*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_bits
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in bits */
-    const char*    argument;
-    long    start;
-    long    len;
-    double referenceValue;
-    double referenceValuePresent;
-    double scale;
-} grib_accessor_bits;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_bits = {
-    &grib_accessor_class_gen,                      /* super */
-    "bits",                      /* name */
-    sizeof(grib_accessor_bits),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    &byte_count,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    &unpack_bytes,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
+grib_accessor_class_bits_t _grib_accessor_class_bits{"bits"};
 grib_accessor_class* grib_accessor_class_bits = &_grib_accessor_class_bits;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_bits* self = (grib_accessor_bits*)a;
+void grib_accessor_class_bits_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_bits_t* self = (grib_accessor_bits_t*)a;
     grib_handle* hand        = grib_handle_of_accessor(a);
     grib_expression* e       = NULL;
     int n                    = 0;
@@ -154,9 +43,8 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
     a->length = 0;
 }
 
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_bits* self = (grib_accessor_bits*)a;
+int grib_accessor_class_bits_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_bits_t* self = (grib_accessor_bits_t*)a;
     grib_accessor* x         = NULL;
     unsigned char* p         = NULL;
     grib_handle* h           = grib_handle_of_accessor(a);
@@ -173,17 +61,15 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
     if (!x)
         return GRIB_NOT_FOUND;
 
-    p    = h->buffer->data + grib_byte_offset(x);
-    *val = grib_decode_unsigned_long(p, &start, length);
+    p    = h->buffer->data + x->byte_offset();    *val = grib_decode_unsigned_long(p, &start, length);
 
     *len = 1;
 
     return ret;
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_bits* self = (grib_accessor_bits*)a;
+int grib_accessor_class_bits_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_bits_t* self = (grib_accessor_bits_t*)a;
     grib_accessor* x         = NULL;
     unsigned char* p         = NULL;
     grib_handle* h           = grib_handle_of_accessor(a);
@@ -200,8 +86,7 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     if (!x)
         return GRIB_NOT_FOUND;
 
-    p    = h->buffer->data + grib_byte_offset(x);
-    *val = grib_decode_unsigned_long(p, &start, length);
+    p    = h->buffer->data + x->byte_offset();    *val = grib_decode_unsigned_long(p, &start, length);
 
     *val = ((long)*val + self->referenceValue) / self->scale;
 
@@ -210,9 +95,8 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     return ret;
 }
 
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_bits* self = (grib_accessor_bits*)a;
+int grib_accessor_class_bits_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_bits_t* self = (grib_accessor_bits_t*)a;
     grib_accessor* x         = NULL;
     grib_handle* h           = grib_handle_of_accessor(a);
     unsigned char* p         = NULL;
@@ -228,15 +112,13 @@ static int pack_double(grib_accessor* a, const double* val, size_t* len)
     if (!x)
         return GRIB_NOT_FOUND;
 
-    p = h->buffer->data + grib_byte_offset(x);
-
+    p = h->buffer->data + x->byte_offset();
     lval = round(*val * self->scale) - self->referenceValue;
     return grib_encode_unsigned_longb(p, lval, &start, length);
 }
 
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_bits* self = (grib_accessor_bits*)a;
+int grib_accessor_class_bits_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_bits_t* self = (grib_accessor_bits_t*)a;
     grib_accessor* x         = NULL;
     grib_handle* h           = grib_handle_of_accessor(a);
     unsigned char* p         = NULL;
@@ -285,14 +167,12 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
         return GRIB_ENCODING_ERROR;
     }
 
-    p = h->buffer->data + grib_byte_offset(x);
-    return grib_encode_unsigned_longb(p, *val, &start, length);
+    p = h->buffer->data + x->byte_offset();    return grib_encode_unsigned_longb(p, *val, &start, length);
 }
 
-static int get_native_type(grib_accessor* a)
-{
+int grib_accessor_class_bits_t::get_native_type(grib_accessor* a){
     int type                 = GRIB_TYPE_BYTES;
-    grib_accessor_bits* self = (grib_accessor_bits*)a;
+    grib_accessor_bits_t* self = (grib_accessor_bits_t*)a;
 
     if (a->flags & GRIB_ACCESSOR_FLAG_STRING_TYPE)
         type = GRIB_TYPE_STRING;
@@ -306,8 +186,7 @@ static int get_native_type(grib_accessor* a)
     return type;
 }
 
-static int unpack_string(grib_accessor* a, char* v, size_t* len)
-{
+int grib_accessor_class_bits_t::unpack_string(grib_accessor* a, char* v, size_t* len){
     int ret                    = 0;
     double dval                = 0;
     long lval                  = 0;
@@ -328,20 +207,17 @@ static int unpack_string(grib_accessor* a, char* v, size_t* len)
             break;
 
         default:
-            super = *(a->cclass->super);
-            ret   = super->unpack_string(a, v, len);
+            ret = grib_accessor_class_gen_t::unpack_string(a, v, len);
     }
     return ret;
 }
 
-static long byte_count(grib_accessor* a)
-{
+long grib_accessor_class_bits_t::byte_count(grib_accessor* a){
     grib_context_log(a->context, GRIB_LOG_DEBUG, "byte_count of %s = %ld", a->name, a->length);
     return a->length;
 }
 
-static int unpack_bytes(grib_accessor* a, unsigned char* buffer, size_t* len)
-{
+int grib_accessor_class_bits_t::unpack_bytes(grib_accessor* a, unsigned char* buffer, size_t* len){
     if (*len < a->length) {
         *len = a->length;
         return GRIB_ARRAY_TOO_SMALL;
diff --git a/src/accessor/grib_accessor_class_bits.h b/src/accessor/grib_accessor_class_bits.h
new file mode 100644
index 000000000..b5dd2977b
--- /dev/null
+++ b/src/accessor/grib_accessor_class_bits.h
@@ -0,0 +1,45 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_bits_h
+#define eccodes_accessor_bits_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_bits_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in bits */
+    const char*    argument;
+    long    start;
+    long    len;
+    double referenceValue;
+    double referenceValuePresent;
+    double scale;
+};
+
+class grib_accessor_class_bits_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_bits_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_bits_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_bytes(grib_accessor*, unsigned char*, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    long byte_count(grib_accessor*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_bits_h */
diff --git a/src/accessor/grib_accessor_class_bits_per_value.cc b/src/accessor/grib_accessor_class_bits_per_value.cc
new file mode 100644
index 000000000..b5d3698e0
--- /dev/null
+++ b/src/accessor/grib_accessor_class_bits_per_value.cc
@@ -0,0 +1,73 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_bits_per_value.h"
+
+grib_accessor_class_bits_per_value_t _grib_accessor_class_bits_per_value{"bits_per_value"};
+grib_accessor_class* grib_accessor_class_bits_per_value = &_grib_accessor_class_bits_per_value;
+
+
+void grib_accessor_class_bits_per_value_t::init(grib_accessor* a, const long l, grib_arguments* args){
+    int n                              = 0;
+    grib_accessor_bits_per_value_t* self = (grib_accessor_bits_per_value_t*)a;
+    self->values                       = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
+    self->bits_per_value               = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
+    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
+    a->length = 0;
+}
+
+int grib_accessor_class_bits_per_value_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    int ret                            = 0;
+    grib_accessor_bits_per_value_t* self = (grib_accessor_bits_per_value_t*)a;
+    grib_handle* h                     = grib_handle_of_accessor(a);
+
+    if ((ret = grib_get_long_internal(h, self->bits_per_value, val)) != GRIB_SUCCESS)
+        return ret;
+
+    *len = 1;
+    return ret;
+}
+
+int grib_accessor_class_bits_per_value_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    double* values                     = NULL;
+    size_t size                        = 0;
+    int ret                            = 0;
+    grib_accessor_bits_per_value_t* self = (grib_accessor_bits_per_value_t*)a;
+    grib_context* c                    = a->context;
+    grib_handle* h                     = grib_handle_of_accessor(a);
+
+    if ((ret = grib_get_size(h, self->values, &size)) != GRIB_SUCCESS)
+        return ret;
+
+    values = (double*)grib_context_malloc(c, size * sizeof(double));
+    if (!values)
+        return GRIB_OUT_OF_MEMORY;
+
+    if ((ret = grib_get_double_array_internal(h, self->values, values, &size)) != GRIB_SUCCESS) {
+        grib_context_free(c, values);
+        return ret;
+    }
+
+    if ((ret = grib_set_long_internal(h, self->bits_per_value, *val)) != GRIB_SUCCESS) {
+        grib_context_free(c, values);
+        return ret;
+    }
+
+    if ((ret = grib_set_double_array_internal(h, self->values, values, size)) != GRIB_SUCCESS) {
+        grib_context_free(c, values);
+        return ret;
+    }
+
+    grib_context_free(c, values);
+
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_bits_per_value.h b/src/accessor/grib_accessor_class_bits_per_value.h
new file mode 100644
index 000000000..59514fc05
--- /dev/null
+++ b/src/accessor/grib_accessor_class_bits_per_value.h
@@ -0,0 +1,35 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_bits_per_value_h
+#define eccodes_accessor_bits_per_value_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_bits_per_value_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in bits_per_value */
+    const char* values;
+    const char* bits_per_value;
+};
+
+class grib_accessor_class_bits_per_value_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_bits_per_value_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_bits_per_value_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_bits_per_value_h */
diff --git a/src/accessor/grib_accessor_class_blob.cc b/src/accessor/grib_accessor_class_blob.cc
new file mode 100644
index 000000000..ddcfc9961
--- /dev/null
+++ b/src/accessor/grib_accessor_class_blob.cc
@@ -0,0 +1,42 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_blob.h"
+
+grib_accessor_class_blob_t _grib_accessor_class_blob{"blob"};
+grib_accessor_class* grib_accessor_class_blob = &_grib_accessor_class_blob;
+
+
+void grib_accessor_class_blob_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    grib_get_long_internal(grib_handle_of_accessor(a), grib_arguments_get_name(a->parent->h, arg, 0), &a->length);
+    Assert(a->length >= 0);
+}
+
+int grib_accessor_class_blob_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_BYTES;
+}
+
+int grib_accessor_class_blob_t::unpack_bytes(grib_accessor* a, unsigned char* buffer, size_t* len){
+    if (*len < (size_t)a->length) {
+        *len = a->length;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+    *len = a->length;
+
+    memcpy(buffer, grib_handle_of_accessor(a)->buffer->data + a->offset, *len);
+
+    return GRIB_SUCCESS;
+}
+
+void grib_accessor_class_blob_t::dump(grib_accessor* a, grib_dumper* dumper){
+    grib_dump_bytes(dumper, a, NULL);
+}
diff --git a/src/accessor/grib_accessor_class_blob.h b/src/accessor/grib_accessor_class_blob.h
new file mode 100644
index 000000000..a2da98a03
--- /dev/null
+++ b/src/accessor/grib_accessor_class_blob.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_blob_h
+#define eccodes_accessor_blob_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_blob_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in blob */
+};
+
+class grib_accessor_class_blob_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_blob_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_blob_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_bytes(grib_accessor*, unsigned char*, size_t* len) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_blob_h */
diff --git a/src/accessor/grib_accessor_class_budgdate.cc b/src/accessor/grib_accessor_class_budgdate.cc
new file mode 100644
index 000000000..1bfd6e7b9
--- /dev/null
+++ b/src/accessor/grib_accessor_class_budgdate.cc
@@ -0,0 +1,82 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_budgdate.h"
+
+grib_accessor_class_budgdate_t _grib_accessor_class_budgdate{"budgdate"};
+grib_accessor_class* grib_accessor_class_budgdate = &_grib_accessor_class_budgdate;
+
+
+void grib_accessor_class_budgdate_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_budgdate_t* self = (grib_accessor_budgdate_t*)a;
+    int n                        = 0;
+
+    self->year  = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->month = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->day   = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+}
+
+int grib_accessor_class_budgdate_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    int ret                      = 0;
+    grib_accessor_budgdate_t* self = (grib_accessor_budgdate_t*)a;
+
+    long year  = 0;
+    long month = 0;
+    long day   = 0;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->day, &day)) != GRIB_SUCCESS)
+        return ret;
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->month, &month)) != GRIB_SUCCESS)
+        return ret;
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->year, &year)) != GRIB_SUCCESS)
+        return ret;
+
+    if (*len < 1)
+        return GRIB_WRONG_ARRAY_SIZE;
+
+    val[0] = (1900 + year) * 10000 + month * 100 + day;
+
+    return ret;
+}
+
+/* TODO: Check for a valid date */
+int grib_accessor_class_budgdate_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    int ret                      = 0;
+    long v                       = val[0];
+    grib_accessor_budgdate_t* self = (grib_accessor_budgdate_t*)a;
+
+    long year  = 0;
+    long month = 0;
+    long day   = 0;
+
+    if (*len != 1)
+        return GRIB_WRONG_ARRAY_SIZE;
+
+    year = v / 10000;
+    v %= 10000;
+    month = v / 100;
+    v %= 100;
+    day = v;
+
+    year -= 1900;
+
+    Assert(year < 255);
+
+    if ((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->day, day)) != GRIB_SUCCESS)
+        return ret;
+    if ((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->month, month)) != GRIB_SUCCESS)
+        return ret;
+    if ((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->year, year)) != GRIB_SUCCESS)
+        return ret;
+
+    return ret;
+}
diff --git a/src/accessor/grib_accessor_class_budgdate.h b/src/accessor/grib_accessor_class_budgdate.h
new file mode 100644
index 000000000..c3fc849c7
--- /dev/null
+++ b/src/accessor/grib_accessor_class_budgdate.h
@@ -0,0 +1,36 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_budgdate_h
+#define eccodes_accessor_budgdate_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_budgdate_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in budgdate */
+    const char* year;
+    const char* month;
+    const char* day;
+};
+
+class grib_accessor_class_budgdate_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_budgdate_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_budgdate_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_budgdate_h */
diff --git a/src/accessor/todo/grib_accessor_class_bufr_data_array.cc b/src/accessor/grib_accessor_class_bufr_data_array.cc
similarity index 87%
rename from src/accessor/todo/grib_accessor_class_bufr_data_array.cc
rename to src/accessor/grib_accessor_class_bufr_data_array.cc
index 3d044835a..ea32d69c4 100644
--- a/src/accessor/todo/grib_accessor_class_bufr_data_array.cc
+++ b/src/accessor/grib_accessor_class_bufr_data_array.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -10,202 +11,11 @@
 
 #include "grib_scaling.h"
 #include "grib_api_internal.h"
+#include "grib_accessor_class_bufr_data_array.h"
 
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = init
-   IMPLEMENTS = dump;destroy
-   IMPLEMENTS = next_offset
-   IMPLEMENTS = byte_count; value_count
-   IMPLEMENTS = byte_offset; unpack_double
-   IMPLEMENTS = get_native_type
-   IMPLEMENTS = pack_long; unpack_double; pack_double
-   MEMBERS    = const char* bufrDataEncodedName
-   MEMBERS    = const char* numberOfSubsetsName
-   MEMBERS    = const char* expandedDescriptorsName
-   MEMBERS    = const char* flagsName
-   MEMBERS    = const char* unitsName
-   MEMBERS    = const char* elementsDescriptorsIndexName
-   MEMBERS    = const char* compressedDataName
-   MEMBERS    = bufr_descriptors_array* expanded
-   MEMBERS    = grib_accessor* expandedAccessor
-   MEMBERS    = int* canBeMissing
-   MEMBERS    = long numberOfSubsets
-   MEMBERS    = long compressedData
-   MEMBERS    = grib_vdarray* numericValues
-   MEMBERS    = grib_vsarray* stringValues
-   MEMBERS    = grib_viarray* elementsDescriptorsIndex
-   MEMBERS    = int do_decode
-   MEMBERS    = int bitmapStartElementsDescriptorsIndex
-   MEMBERS    = int bitmapCurrentElementsDescriptorsIndex
-   MEMBERS    = int bitmapSize
-   MEMBERS    = int bitmapStart
-   MEMBERS    = int bitmapCurrent
-   MEMBERS    = grib_accessors_list* dataAccessors
-   MEMBERS    = int unpackMode
-   MEMBERS    = int bitsToEndData
-   MEMBERS    = grib_section* dataKeys
-   MEMBERS    = double* inputBitmap
-   MEMBERS    = int nInputBitmap
-   MEMBERS    = int iInputBitmap
-   MEMBERS    = long* inputReplications
-   MEMBERS    = int nInputReplications
-   MEMBERS    = int iInputReplications
-   MEMBERS    = long* inputExtendedReplications
-   MEMBERS    = int nInputExtendedReplications
-   MEMBERS    = int iInputExtendedReplications
-   MEMBERS    = long* inputShortReplications
-   MEMBERS    = int nInputShortReplications
-   MEMBERS    = int iInputShortReplications
-   MEMBERS    = grib_iarray* iss_list
-   MEMBERS    = grib_trie_with_rank* dataAccessorsTrie
-   MEMBERS    = grib_sarray* tempStrings
-   MEMBERS    = grib_vdarray* tempDoubleValues
-   MEMBERS    = int change_ref_value_operand
-   MEMBERS    = size_t refValListSize
-   MEMBERS    = long* refValList
-   MEMBERS    = long refValIndex
-   MEMBERS    = bufr_tableb_override* tableb_override
-   MEMBERS    = int set_to_missing_if_out_of_range
-
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static long byte_count(grib_accessor*);
-static long byte_offset(grib_accessor*);
-static long next_offset(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-static void destroy(grib_context*, grib_accessor*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_bufr_data_array
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in bufr_data_array */
-    const char* bufrDataEncodedName;
-    const char* numberOfSubsetsName;
-    const char* expandedDescriptorsName;
-    const char* flagsName;
-    const char* unitsName;
-    const char* elementsDescriptorsIndexName;
-    const char* compressedDataName;
-    bufr_descriptors_array* expanded;
-    grib_accessor* expandedAccessor;
-    int* canBeMissing;
-    long numberOfSubsets;
-    long compressedData;
-    grib_vdarray* numericValues;
-    grib_vsarray* stringValues;
-    grib_viarray* elementsDescriptorsIndex;
-    int do_decode;
-    int bitmapStartElementsDescriptorsIndex;
-    int bitmapCurrentElementsDescriptorsIndex;
-    int bitmapSize;
-    int bitmapStart;
-    int bitmapCurrent;
-    grib_accessors_list* dataAccessors;
-    int unpackMode;
-    int bitsToEndData;
-    grib_section* dataKeys;
-    double* inputBitmap;
-    int nInputBitmap;
-    int iInputBitmap;
-    long* inputReplications;
-    int nInputReplications;
-    int iInputReplications;
-    long* inputExtendedReplications;
-    int nInputExtendedReplications;
-    int iInputExtendedReplications;
-    long* inputShortReplications;
-    int nInputShortReplications;
-    int iInputShortReplications;
-    grib_iarray* iss_list;
-    grib_trie_with_rank* dataAccessorsTrie;
-    grib_sarray* tempStrings;
-    grib_vdarray* tempDoubleValues;
-    int change_ref_value_operand;
-    size_t refValListSize;
-    long* refValList;
-    long refValIndex;
-    bufr_tableb_override* tableb_override;
-    int set_to_missing_if_out_of_range;
-} grib_accessor_bufr_data_array;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_bufr_data_array = {
-    &grib_accessor_class_gen,                      /* super */
-    "bufr_data_array",                      /* name */
-    sizeof(grib_accessor_bufr_data_array),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    &destroy,                    /* destroy */
-    &dump,                       /* dump */
-    &next_offset,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    &byte_count,                 /* get number of bytes */
-    &byte_offset,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
+grib_accessor_class_bufr_data_array_t _grib_accessor_class_bufr_data_array{"bufr_data_array"};
 grib_accessor_class* grib_accessor_class_bufr_data_array = &_grib_accessor_class_bufr_data_array;
 
-/* END_CLASS_IMP */
 
 #define MAX_NESTED_REPLICATIONS 8
 
@@ -225,33 +35,27 @@ grib_accessor_class* grib_accessor_class_bufr_data_array = &_grib_accessor_class
             return retval;                          \
     }
 
-static int process_elements(grib_accessor* a, int flag, long onlySubset, long startSubset, long endSubset);
+int process_elements(grib_accessor* a, int flag, long onlySubset, long startSubset, long endSubset);
+typedef int (*codec_element_proc)(grib_context* c, grib_accessor_bufr_data_array_t* self, int subsetIndex, grib_buffer* b, unsigned char* data, long* pos, int i, bufr_descriptor* descriptor, long elementIndex, grib_darray* dval, grib_sarray* sval);
+typedef int (*codec_replication_proc)(grib_context* c, grib_accessor_bufr_data_array_t* self, int subsetIndex, grib_buffer* buff, unsigned char* data, long* pos, int i, long elementIndex, grib_darray* dval, long* numberOfRepetitions);
 
-typedef int (*codec_element_proc)(grib_context* c, grib_accessor_bufr_data_array* self, int subsetIndex, grib_buffer* b, unsigned char* data, long* pos, int i, bufr_descriptor* descriptor, long elementIndex, grib_darray* dval, grib_sarray* sval);
-typedef int (*codec_replication_proc)(grib_context* c, grib_accessor_bufr_data_array* self, int subsetIndex, grib_buffer* buff, unsigned char* data, long* pos, int i, long elementIndex, grib_darray* dval, long* numberOfRepetitions);
-
-static int create_keys(const grib_accessor* a, long onlySubset, long startSubset, long endSubset);
-
-static void restart_bitmap(grib_accessor_bufr_data_array* self)
-{
+int create_keys(const grib_accessor* a, long onlySubset, long startSubset, long endSubset);
+void restart_bitmap(grib_accessor_bufr_data_array_t* self){
     self->bitmapCurrent                         = -1;
     self->bitmapCurrentElementsDescriptorsIndex = self->bitmapStartElementsDescriptorsIndex - 1;
 }
 
-static void cancel_bitmap(grib_accessor_bufr_data_array* self)
-{
+void cancel_bitmap(grib_accessor_bufr_data_array_t* self){
     self->bitmapCurrent = -1;
     self->bitmapStart   = -1;
 }
 
-static int is_bitmap_start_defined(grib_accessor_bufr_data_array* self)
-{
+int is_bitmap_start_defined(grib_accessor_bufr_data_array_t* self){
     return self->bitmapStart == -1 ? 0 : 1;
 }
 
-static size_t get_length(grib_accessor* a)
-{
-    grib_accessor_bufr_data_array* self = (grib_accessor_bufr_data_array*)a;
+size_t get_length(grib_accessor* a){
+    grib_accessor_bufr_data_array_t* self = (grib_accessor_bufr_data_array_t*)a;
     size_t len                          = 0;
 
     const grib_handle* h = grib_handle_of_accessor(a);
@@ -262,8 +66,7 @@ static size_t get_length(grib_accessor* a)
 }
 
 /* Operator 203YYY: Store the TableB code and changed reference value in linked list */
-static void tableB_override_store_ref_val(grib_context* c, grib_accessor_bufr_data_array* self, int code, long new_ref_val)
-{
+void tableB_override_store_ref_val(grib_context* c, grib_accessor_bufr_data_array_t* self, int code, long new_ref_val){
     bufr_tableb_override* tb = (bufr_tableb_override*)grib_context_malloc_clear(c, sizeof(bufr_tableb_override));
     tb->code                 = code;
     tb->new_ref_val          = new_ref_val;
@@ -280,8 +83,7 @@ static void tableB_override_store_ref_val(grib_context* c, grib_accessor_bufr_da
 }
 
 /* Operator 203YYY: Retrieve changed reference value from linked list */
-static int tableB_override_get_ref_val(grib_accessor_bufr_data_array* self, int code, long* out_ref_val)
-{
+int tableB_override_get_ref_val(grib_accessor_bufr_data_array_t* self, int code, long* out_ref_val){
     bufr_tableb_override* p = self->tableb_override;
     while (p) {
         if (p->code == code) {
@@ -294,8 +96,7 @@ static int tableB_override_get_ref_val(grib_accessor_bufr_data_array* self, int
 }
 
 /* Operator 203YYY: Clear and free linked list */
-static void tableB_override_clear(grib_context* c, grib_accessor_bufr_data_array* self)
-{
+void tableB_override_clear(grib_context* c, grib_accessor_bufr_data_array_t* self){
     bufr_tableb_override* tb = self->tableb_override;
     while (tb) {
         bufr_tableb_override* n = tb->next;
@@ -306,8 +107,7 @@ static void tableB_override_clear(grib_context* c, grib_accessor_bufr_data_array
 }
 
 /* Operator 203YYY: Copy contents of linked list to the transient array key */
-static int tableB_override_set_key(grib_handle* h, grib_accessor_bufr_data_array* self)
-{
+int tableB_override_set_key(grib_handle* h, grib_accessor_bufr_data_array_t* self){
     int err                  = GRIB_SUCCESS;
     size_t size              = 0;
     long* refVals            = NULL;
@@ -327,8 +127,7 @@ static int tableB_override_set_key(grib_handle* h, grib_accessor_bufr_data_array
     return err;
 }
 /* Check numBits is sufficient for entries in the overridden reference values list*/
-static int check_overridden_reference_values(const grib_context* c, long* refValList, size_t refValListSize, int numBits)
-{
+int check_overridden_reference_values(const grib_context* c, long* refValList, size_t refValListSize, int numBits){
     const long maxval = (1 << (numBits - 1)) - 1;
     const long minval = -(1 << (numBits - 1));
     size_t i          = 0;
@@ -343,7 +142,7 @@ static int check_overridden_reference_values(const grib_context* c, long* refVal
     return GRIB_SUCCESS;
 }
 
-// static void tableB_override_dump(grib_accessor_bufr_data_array *self)
+// void tableB_override_dump(grib_accessor_bufr_data_array_t *self)
 // {
 //     bufr_tableb_override* p = self->tableb_override;
 //     int i = 1;
@@ -357,9 +156,8 @@ static int check_overridden_reference_values(const grib_context* c, long* refVal
 #define DYN_ARRAY_SIZE_INIT 1000 /* Initial size for grib_iarray_new and grib_darray_new */
 #define DYN_ARRAY_SIZE_INCR 1000 /* Increment size for grib_iarray_new and grib_darray_new */
 
-static void init(grib_accessor* a, const long v, grib_arguments* params)
-{
-    grib_accessor_bufr_data_array* self = (grib_accessor_bufr_data_array*)a;
+void grib_accessor_class_bufr_data_array_t::init(grib_accessor* a, const long v, grib_arguments* params){
+    grib_accessor_bufr_data_array_t* self = (grib_accessor_bufr_data_array_t*)a;
     int n                               = 0;
     const char* dataKeysName            = NULL;
     grib_accessor* dataKeysAcc          = NULL;
@@ -397,7 +195,7 @@ static void init(grib_accessor* a, const long v, grib_arguments* params)
     /* Assert(a->length>=0); */
 }
 
-// static void clean_string(char* s,int len)
+// void clean_string(char* s,int len)
 // {
 //     int i=len-1;
 //     while (i) {
@@ -407,8 +205,7 @@ static void init(grib_accessor* a, const long v, grib_arguments* params)
 //     }
 // }
 
-static int check_end_data(grib_context* c, bufr_descriptor* bd, grib_accessor_bufr_data_array* self, int size)
-{
+int check_end_data(grib_context* c, bufr_descriptor* bd, grib_accessor_bufr_data_array_t* self, int size){
     const int saved_bitsToEndData = self->bitsToEndData;
     if (c->debug == 1)
         grib_context_log(c, GRIB_LOG_DEBUG, "BUFR data decoding: \tbitsToEndData=%d elementSize=%d", self->bitsToEndData, size);
@@ -422,8 +219,7 @@ static int check_end_data(grib_context* c, bufr_descriptor* bd, grib_accessor_bu
     return 0;
 }
 
-static void self_clear(grib_context* c, grib_accessor_bufr_data_array* self)
-{
+void self_clear(grib_context* c, grib_accessor_bufr_data_array_t* self){
     grib_context_free(c, self->canBeMissing);
     grib_vdarray_delete_content(c, self->numericValues);
     grib_vdarray_delete(c, self->numericValues);
@@ -452,69 +248,62 @@ static void self_clear(grib_context* c, grib_accessor_bufr_data_array* self)
     if (self->inputBitmap) grib_context_free(c, self->inputBitmap);
 }
 
-static int get_native_type(grib_accessor* a)
-{
+int grib_accessor_class_bufr_data_array_t::get_native_type(grib_accessor* a){
     return GRIB_TYPE_DOUBLE;
 }
 
-static long byte_count(grib_accessor* a)
-{
+long grib_accessor_class_bufr_data_array_t::byte_count(grib_accessor* a){
     return 0;
 }
 
-static long byte_offset(grib_accessor* a)
-{
+long grib_accessor_class_bufr_data_array_t::byte_offset(grib_accessor* a){
     return a->offset;
 }
 
-static long next_offset(grib_accessor* a)
-{
+long grib_accessor_class_bufr_data_array_t::next_offset(grib_accessor* a){
     return a->offset;
 }
 
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_bufr_data_array* self = (grib_accessor_bufr_data_array*)a;
+int grib_accessor_class_bufr_data_array_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_bufr_data_array_t* self = (grib_accessor_bufr_data_array_t*)a;
     self->do_decode                     = 1;
 
     return GRIB_NOT_IMPLEMENTED;
 }
 
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_bufr_data_array* self = (grib_accessor_bufr_data_array*)a;
+int grib_accessor_class_bufr_data_array_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_bufr_data_array_t* self = (grib_accessor_bufr_data_array_t*)a;
     self->do_decode                     = 1;
     return process_elements(a, PROCESS_ENCODE, 0, 0, 0);
 }
 
 grib_vsarray* accessor_bufr_data_array_get_stringValues(grib_accessor* a)
 {
-    grib_accessor_bufr_data_array* self = (grib_accessor_bufr_data_array*)a;
+    grib_accessor_bufr_data_array_t* self = (grib_accessor_bufr_data_array_t*)a;
     process_elements(a, PROCESS_DECODE, 0, 0, 0);
     return self->stringValues;
 }
 
 grib_accessors_list* accessor_bufr_data_array_get_dataAccessors(grib_accessor* a)
 {
-    grib_accessor_bufr_data_array* self = (grib_accessor_bufr_data_array*)a;
+    grib_accessor_bufr_data_array_t* self = (grib_accessor_bufr_data_array_t*)a;
     return self->dataAccessors;
 }
 
 grib_trie_with_rank* accessor_bufr_data_array_get_dataAccessorsTrie(grib_accessor* a)
 {
-    grib_accessor_bufr_data_array* self = (grib_accessor_bufr_data_array*)a;
+    grib_accessor_bufr_data_array_t* self = (grib_accessor_bufr_data_array_t*)a;
     return self->dataAccessorsTrie;
 }
 
 void accessor_bufr_data_array_set_unpackMode(grib_accessor* a, int unpackMode)
 {
-    grib_accessor_bufr_data_array* self = (grib_accessor_bufr_data_array*)a;
+    grib_accessor_bufr_data_array_t* self = (grib_accessor_bufr_data_array_t*)a;
     self->unpackMode                    = unpackMode;
 }
 
-static int get_descriptors(grib_accessor* a)
-{
-    grib_accessor_bufr_data_array* self = (grib_accessor_bufr_data_array*)a;
+int get_descriptors(grib_accessor* a){
+    grib_accessor_bufr_data_array_t* self = (grib_accessor_bufr_data_array_t*)a;
     int ret                             = 0, i, numberOfDescriptors;
     grib_handle* h                      = grib_handle_of_accessor(a);
     grib_context* c                     = a->context;
@@ -539,8 +328,8 @@ static int get_descriptors(grib_accessor* a)
     return ret;
 }
 
-static int decode_string_array(grib_context* c, unsigned char* data, long* pos, bufr_descriptor* bd,
-                               grib_accessor_bufr_data_array* self)
+int decode_string_array(grib_context* c, unsigned char* data, long* pos, bufr_descriptor* bd,
+                               grib_accessor_bufr_data_array_t* self)
 {
     int ret    = 0;
     int* err   = &ret;
@@ -597,9 +386,9 @@ static int decode_string_array(grib_context* c, unsigned char* data, long* pos,
     return ret;
 }
 
-static grib_darray* decode_double_array(grib_context* c, unsigned char* data, long* pos,
+grib_darray* decode_double_array(grib_context* c, unsigned char* data, long* pos,
                                         bufr_descriptor* bd, int canBeMissing,
-                                        grib_accessor_bufr_data_array* self, int* err)
+                                        grib_accessor_bufr_data_array_t* self, int* err)
 {
     grib_darray* ret = NULL;
     int j;
@@ -680,8 +469,8 @@ static grib_darray* decode_double_array(grib_context* c, unsigned char* data, lo
     return ret;
 }
 
-static int encode_string_array(grib_context* c, grib_buffer* buff, long* pos, bufr_descriptor* bd,
-                               grib_accessor_bufr_data_array* self, grib_sarray* stringValues)
+int encode_string_array(grib_context* c, grib_buffer* buff, long* pos, bufr_descriptor* bd,
+                               grib_accessor_bufr_data_array_t* self, grib_sarray* stringValues)
 {
     int err = 0, n, ival;
     int k, j, modifiedWidth, width;
@@ -737,8 +526,7 @@ static int encode_string_array(grib_context* c, grib_buffer* buff, long* pos, bu
     return err;
 }
 
-static void set_missing_long_to_double(grib_darray* dvalues)
-{
+void set_missing_long_to_double(grib_darray* dvalues){
     size_t i, n = grib_darray_used_size(dvalues);
     for (i = 0; i < n; i++) {
         if (dvalues->v[i] == GRIB_MISSING_LONG)
@@ -747,7 +535,7 @@ static void set_missing_long_to_double(grib_darray* dvalues)
 }
 
 /* ECC-750: The 'factor' argument is 10^-scale */
-static int descriptor_get_min_max(bufr_descriptor* bd, long width, long reference, double factor,
+int descriptor_get_min_max(bufr_descriptor* bd, long width, long reference, double factor,
                                   double* minAllowed, double* maxAllowed)
 {
     /* Maximum value is allowed to be the largest number (all bits 1) which means it's MISSING */
@@ -763,8 +551,8 @@ static int descriptor_get_min_max(bufr_descriptor* bd, long width, long referenc
     return GRIB_SUCCESS;
 }
 
-static int encode_double_array(grib_context* c, grib_buffer* buff, long* pos, bufr_descriptor* bd,
-                               grib_accessor_bufr_data_array* self, grib_darray* dvalues)
+int encode_double_array(grib_context* c, grib_buffer* buff, long* pos, bufr_descriptor* bd,
+                               grib_accessor_bufr_data_array_t* self, grib_darray* dvalues)
 {
     int err = 0;
     int j, i;
@@ -981,8 +769,8 @@ static int encode_double_array(grib_context* c, grib_buffer* buff, long* pos, bu
     return err;
 }
 
-static int encode_double_value(grib_context* c, grib_buffer* buff, long* pos, bufr_descriptor* bd,
-                               grib_accessor_bufr_data_array* self, double value)
+int encode_double_value(grib_context* c, grib_buffer* buff, long* pos, bufr_descriptor* bd,
+                               grib_accessor_bufr_data_array_t* self, double value)
 {
     size_t lval;
     double maxAllowed, minAllowed;
@@ -1028,8 +816,8 @@ static int encode_double_value(grib_context* c, grib_buffer* buff, long* pos, bu
     return err;
 }
 
-static int encode_string_value(grib_context* c, grib_buffer* buff, long* pos, bufr_descriptor* bd,
-                               grib_accessor_bufr_data_array* self, char* sval)
+int encode_string_value(grib_context* c, grib_buffer* buff, long* pos, bufr_descriptor* bd,
+                               grib_accessor_bufr_data_array_t* self, char* sval)
 {
     int err = 0;
     int len;
@@ -1044,8 +832,8 @@ static int encode_string_value(grib_context* c, grib_buffer* buff, long* pos, bu
     return err;
 }
 
-static char* decode_string_value(grib_context* c, unsigned char* data, long* pos, bufr_descriptor* bd,
-                                 grib_accessor_bufr_data_array* self, int* err)
+char* decode_string_value(grib_context* c, unsigned char* data, long* pos, bufr_descriptor* bd,
+                                 grib_accessor_bufr_data_array_t* self, int* err)
 {
     char* sval = 0;
     int len;
@@ -1067,9 +855,9 @@ static char* decode_string_value(grib_context* c, unsigned char* data, long* pos
     return sval;
 }
 
-static double decode_double_value(grib_context* c, unsigned char* data, long* pos,
+double decode_double_value(grib_context* c, unsigned char* data, long* pos,
                                   bufr_descriptor* bd, int canBeMissing,
-                                  grib_accessor_bufr_data_array* self, int* err)
+                                  grib_accessor_bufr_data_array_t* self, int* err)
 {
     size_t lval;
     int modifiedWidth, modifiedReference;
@@ -1098,7 +886,7 @@ static double decode_double_value(grib_context* c, unsigned char* data, long* po
     return dval;
 }
 
-static int decode_element(grib_context* c, grib_accessor_bufr_data_array* self, int subsetIndex,
+int decode_element(grib_context* c, grib_accessor_bufr_data_array_t* self, int subsetIndex,
                           grib_buffer* b, unsigned char* data, long* pos, int i, bufr_descriptor* descriptor, long elementIndex,
                           grib_darray* dval, grib_sarray* sval)
 {
@@ -1180,7 +968,7 @@ static int decode_element(grib_context* c, grib_accessor_bufr_data_array* self,
     return err;
 }
 
-static int decode_replication(grib_context* c, grib_accessor_bufr_data_array* self, int subsetIndex,
+int decode_replication(grib_context* c, grib_accessor_bufr_data_array_t* self, int subsetIndex,
                               grib_buffer* buff, unsigned char* data, long* pos, int i, long elementIndex, grib_darray* dval, long* numberOfRepetitions)
 {
     int ret = 0;
@@ -1245,8 +1033,7 @@ static int decode_replication(grib_context* c, grib_accessor_bufr_data_array* se
     return ret;
 }
 
-static int encode_new_bitmap(grib_context* c, grib_buffer* buff, long* pos, int idx, grib_accessor_bufr_data_array* self)
-{
+int encode_new_bitmap(grib_context* c, grib_buffer* buff, long* pos, int idx, grib_accessor_bufr_data_array_t* self){
     grib_darray* doubleValues = NULL;
     int err                   = 0;
     double cdval              = 0;
@@ -1268,7 +1055,7 @@ static int encode_new_bitmap(grib_context* c, grib_buffer* buff, long* pos, int
 }
 
 /* Operator 203YYY: Change Reference Values: Encoding definition phase */
-static int encode_overridden_reference_value(grib_context* c, grib_accessor_bufr_data_array* self,
+int encode_overridden_reference_value(grib_context* c, grib_accessor_bufr_data_array_t* self,
                                              grib_buffer* buff, long* pos, bufr_descriptor* bd)
 {
     int err         = 0;
@@ -1307,7 +1094,7 @@ static int encode_overridden_reference_value(grib_context* c, grib_accessor_bufr
     return err;
 }
 
-static int encode_new_element(grib_context* c, grib_accessor_bufr_data_array* self, int subsetIndex,
+int encode_new_element(grib_context* c, grib_accessor_bufr_data_array_t* self, int subsetIndex,
                               grib_buffer* buff, unsigned char* data, long* pos, int i, bufr_descriptor* descriptor,
                               long elementIndex, grib_darray* dval, grib_sarray* sval)
 {
@@ -1367,7 +1154,7 @@ static int encode_new_element(grib_context* c, grib_accessor_bufr_data_array* se
     return err;
 }
 
-static int encode_new_replication(grib_context* c, grib_accessor_bufr_data_array* self, int subsetIndex,
+int encode_new_replication(grib_context* c, grib_accessor_bufr_data_array_t* self, int subsetIndex,
                                   grib_buffer* buff, unsigned char* data, long* pos, int i, long elementIndex, grib_darray* dval, long* numberOfRepetitions)
 {
     int err                       = 0;
@@ -1430,7 +1217,7 @@ static int encode_new_replication(grib_context* c, grib_accessor_bufr_data_array
     return err;
 }
 
-static int encode_element(grib_context* c, grib_accessor_bufr_data_array* self, int subsetIndex,
+int encode_element(grib_context* c, grib_accessor_bufr_data_array_t* self, int subsetIndex,
                           grib_buffer* buff, unsigned char* data, long* pos, int i, bufr_descriptor* descriptor,
                           long elementIndex, grib_darray* dval, grib_sarray* sval)
 {
@@ -1501,7 +1288,7 @@ static int encode_element(grib_context* c, grib_accessor_bufr_data_array* self,
     return err;
 }
 
-static int encode_replication(grib_context* c, grib_accessor_bufr_data_array* self, int subsetIndex,
+int encode_replication(grib_context* c, grib_accessor_bufr_data_array_t* self, int subsetIndex,
                               grib_buffer* buff, unsigned char* data, long* pos, int i, long elementIndex,
                               grib_darray* dval, long* numberOfRepetitions)
 {
@@ -1517,7 +1304,7 @@ static int encode_replication(grib_context* c, grib_accessor_bufr_data_array* se
     return encode_element(c, self, subsetIndex, buff, data, pos, i, 0, elementIndex, dval, 0);
 }
 
-static int build_bitmap(grib_accessor_bufr_data_array* self, unsigned char* data, long* pos,
+int build_bitmap(grib_accessor_bufr_data_array_t* self, unsigned char* data, long* pos,
                         int iel, grib_iarray* elementsDescriptorsIndex, int iBitmapOperator)
 {
     int bitmapSize = 0, iDelayedReplication = 0;
@@ -1615,8 +1402,7 @@ static int build_bitmap(grib_accessor_bufr_data_array* self, unsigned char* data
     return GRIB_SUCCESS;
 }
 
-static int consume_bitmap(grib_accessor_bufr_data_array* self, int iBitmapOperator)
-{
+int consume_bitmap(grib_accessor_bufr_data_array_t* self, int iBitmapOperator){
     int bitmapSize = 0, iDelayedReplication;
     int i;
     bufr_descriptor** descriptors = self->expanded->v;
@@ -1646,7 +1432,7 @@ static int consume_bitmap(grib_accessor_bufr_data_array* self, int iBitmapOperat
     return GRIB_SUCCESS;
 }
 
-static int build_bitmap_new_data(grib_accessor_bufr_data_array* self, unsigned char* data, long* pos,
+int build_bitmap_new_data(grib_accessor_bufr_data_array_t* self, unsigned char* data, long* pos,
                                  int iel, grib_iarray* elementsDescriptorsIndex, int iBitmapOperator)
 {
     int bitmapSize = 0, iDelayedReplication = 0;
@@ -1733,8 +1519,7 @@ static int build_bitmap_new_data(grib_accessor_bufr_data_array* self, unsigned c
 }
 
 /* ECC-1304: Will return an index if successful. In case of an error, a negative number is returned e.g. GRIB_WRONG_BITMAP_SIZE */
-static int get_next_bitmap_descriptor_index_new_bitmap(grib_accessor_bufr_data_array* self, grib_iarray* elementsDescriptorsIndex, int compressedData)
-{
+int get_next_bitmap_descriptor_index_new_bitmap(grib_accessor_bufr_data_array_t* self, grib_iarray* elementsDescriptorsIndex, int compressedData){
     int i;
     bufr_descriptor** descriptors = self->expanded->v;
 
@@ -1771,8 +1556,7 @@ static int get_next_bitmap_descriptor_index_new_bitmap(grib_accessor_bufr_data_a
 }
 
 /* ECC-1304: Will return an index if successful. In case of an error, a negative number is returned e.g. GRIB_WRONG_BITMAP_SIZE */
-static int get_next_bitmap_descriptor_index(grib_accessor_bufr_data_array* self, grib_iarray* elementsDescriptorsIndex, grib_darray* numericValues)
-{
+int get_next_bitmap_descriptor_index(grib_accessor_bufr_data_array_t* self, grib_iarray* elementsDescriptorsIndex, grib_darray* numericValues){
     int i;
     bufr_descriptor** descriptors = self->expanded->v;
 
@@ -1813,8 +1597,7 @@ static int get_next_bitmap_descriptor_index(grib_accessor_bufr_data_array* self,
     return elementsDescriptorsIndex->v[self->bitmapCurrentElementsDescriptorsIndex];
 }
 
-static void push_zero_element(grib_accessor_bufr_data_array* self, grib_darray* dval)
-{
+void push_zero_element(grib_accessor_bufr_data_array_t* self, grib_darray* dval){
     grib_darray* d   = 0;
     grib_accessor* a = (grib_accessor*)self;
     grib_context* c  = a->context;
@@ -1828,7 +1611,7 @@ static void push_zero_element(grib_accessor_bufr_data_array* self, grib_darray*
     }
 }
 
-static grib_accessor* create_attribute_variable(const char* name, grib_section* section, int type, char* sval, double dval, long lval, unsigned long flags)
+grib_accessor* create_attribute_variable(const char* name, grib_section* section, int type, char* sval, double dval, long lval, unsigned long flags)
 {
     grib_accessor* a    = NULL;
     grib_action creator = {0,};
@@ -1846,26 +1629,22 @@ static grib_accessor* create_attribute_variable(const char* name, grib_section*
     len = 1;
     switch (type) {
         case GRIB_TYPE_LONG:
-            grib_pack_long(a, &lval, &len);
-            break;
+            a->pack_long(&lval, &len);            break;
         case GRIB_TYPE_DOUBLE:
-            grib_pack_double(a, &dval, &len);
-            break;
+            a->pack_double(&dval, &len);            break;
         case GRIB_TYPE_STRING:
             if (!sval)
                 return NULL;
             /* Performance: No need for len=strlen(sval). It's not used. */
             /* See grib_accessor_class_variable.c, pack_string() */
             len = 0;
-            grib_pack_string(a, sval, &len);
-            break;
+            a->pack_string(sval, &len);            break;
     }
 
     return a;
 }
 
-static void set_creator_name(grib_action* creator, int code)
-{
+void set_creator_name(grib_action* creator, int code){
     switch (code) {
         case 222000:
             creator->name = (char*)"qualityInformationFollows";
@@ -1937,8 +1716,7 @@ static void set_creator_name(grib_action* creator, int code)
 }
 
 /* See ECC-741 */
-static int adding_extra_key_attributes(grib_handle* h)
-{
+int adding_extra_key_attributes(grib_handle* h){
     long skip = 0; /* default is to add */
     int err   = 0;
     err       = grib_get_long(h, "skipExtraKeyAttributes", &skip);
@@ -1947,11 +1725,11 @@ static int adding_extra_key_attributes(grib_handle* h)
     return (!skip);
 }
 
-static grib_accessor* create_accessor_from_descriptor(const grib_accessor* a, grib_accessor* attribute, grib_section* section,
+grib_accessor* create_accessor_from_descriptor(const grib_accessor* a, grib_accessor* attribute, grib_section* section,
                                                       long ide, long subset, int add_dump_flag, int add_coord_flag,
                                                       int count, int add_extra_attributes)
 {
-    grib_accessor_bufr_data_array* self = (grib_accessor_bufr_data_array*)a;
+    grib_accessor_bufr_data_array_t* self = (grib_accessor_bufr_data_array_t*)a;
     char code[10]               = {0,};
     char* temp_str              = NULL;
     int idx                     = 0;
@@ -2014,13 +1792,13 @@ static grib_accessor* create_accessor_from_descriptor(const grib_accessor* a, gr
                 if (attribute->attributes[i]) attribute->attributes[i]->parent=elementAccessor->parent;
             }
             */
-                grib_accessor_add_attribute(elementAccessor, attribute, 0);
+                elementAccessor->add_attribute(attribute, 0);
             }
 
             attribute = create_attribute_variable("index", section, GRIB_TYPE_LONG, 0, 0, count, flags);
             if (!attribute)
                 return NULL;
-            grib_accessor_add_attribute(elementAccessor, attribute, 0);
+            elementAccessor->add_attribute(attribute, 0);
 
             snprintf(code, sizeof(code), "%06ld", self->expanded->v[idx]->code);
             temp_str  = grib_context_strdup(a->context, code);
@@ -2028,28 +1806,28 @@ static grib_accessor* create_accessor_from_descriptor(const grib_accessor* a, gr
             if (!attribute)
                 return NULL;
             grib_sarray_push(a->context, self->tempStrings, temp_str); /* ECC-325: store alloc'd string (due to strdup) for clean up later */
-            grib_accessor_add_attribute(elementAccessor, attribute, 0);
+            elementAccessor->add_attribute(attribute, 0);
 
             if (add_extra_attributes) {
                 attribute = create_attribute_variable("units", section, GRIB_TYPE_STRING, self->expanded->v[idx]->units, 0, 0, GRIB_ACCESSOR_FLAG_DUMP | flags);
                 if (!attribute)
                     return NULL;
-                grib_accessor_add_attribute(elementAccessor, attribute, 0);
+                elementAccessor->add_attribute(attribute, 0);
 
                 attribute = create_attribute_variable("scale", section, GRIB_TYPE_LONG, 0, 0, self->expanded->v[idx]->scale, flags);
                 if (!attribute)
                     return NULL;
-                grib_accessor_add_attribute(elementAccessor, attribute, 0);
+                elementAccessor->add_attribute(attribute, 0);
 
                 attribute = create_attribute_variable("reference", section, GRIB_TYPE_DOUBLE, 0, self->expanded->v[idx]->reference, 0, flags);
                 if (!attribute)
                     return NULL;
-                grib_accessor_add_attribute(elementAccessor, attribute, 0);
+                elementAccessor->add_attribute(attribute, 0);
 
                 attribute = create_attribute_variable("width", section, GRIB_TYPE_LONG, 0, 0, self->expanded->v[idx]->width, flags);
                 if (!attribute)
                     return NULL;
-                grib_accessor_add_attribute(elementAccessor, attribute, 0);
+                elementAccessor->add_attribute(attribute, 0);
             }
             break;
         case 2:
@@ -2071,7 +1849,7 @@ static grib_accessor* create_accessor_from_descriptor(const grib_accessor* a, gr
                 attribute = create_attribute_variable("index", section, GRIB_TYPE_LONG, 0, 0, count, flags);
                 if (!attribute)
                     return NULL;
-                grib_accessor_add_attribute(elementAccessor, attribute, 0);
+                elementAccessor->add_attribute(attribute, 0);
             }
             else {
                 elementAccessor = grib_accessor_factory(section, &operatorCreator, 0, NULL);
@@ -2080,13 +1858,13 @@ static grib_accessor* create_accessor_from_descriptor(const grib_accessor* a, gr
                 attribute = create_attribute_variable("index", section, GRIB_TYPE_LONG, 0, 0, count, flags);
                 if (!attribute)
                     return NULL;
-                grib_accessor_add_attribute(elementAccessor, attribute, 0);
+                elementAccessor->add_attribute(attribute, 0);
 
                 snprintf(code, sizeof(code), "%06ld", self->expanded->v[idx]->code);
                 attribute = create_attribute_variable("code", section, GRIB_TYPE_STRING, code, 0, 0, flags);
                 if (!attribute)
                     return NULL;
-                grib_accessor_add_attribute(elementAccessor, attribute, 0);
+                elementAccessor->add_attribute(attribute, 0);
             }
             self->expanded->v[idx]->a = elementAccessor;
             break;
@@ -2106,34 +1884,34 @@ static grib_accessor* create_accessor_from_descriptor(const grib_accessor* a, gr
             attribute = create_attribute_variable("index", section, GRIB_TYPE_LONG, 0, 0, count, flags);
             if (!attribute)
                 return NULL;
-            grib_accessor_add_attribute(elementAccessor, attribute, 0);
+            elementAccessor->add_attribute(attribute, 0);
 
             snprintf(code, sizeof(code), "%06ld", self->expanded->v[idx]->code);
             attribute = create_attribute_variable("code", section, GRIB_TYPE_STRING, code, 0, 0, flags);
             if (!attribute)
                 return NULL;
-            grib_accessor_add_attribute(elementAccessor, attribute, 0);
+            elementAccessor->add_attribute(attribute, 0);
 
             if (add_extra_attributes) {
                 attribute = create_attribute_variable("units", section, GRIB_TYPE_STRING, self->expanded->v[idx]->units, 0, 0, GRIB_ACCESSOR_FLAG_DUMP);
                 if (!attribute)
                     return NULL;
-                grib_accessor_add_attribute(elementAccessor, attribute, 0);
+                elementAccessor->add_attribute(attribute, 0);
 
                 attribute = create_attribute_variable("scale", section, GRIB_TYPE_LONG, 0, 0, self->expanded->v[idx]->scale, flags);
                 if (!attribute)
                     return NULL;
-                grib_accessor_add_attribute(elementAccessor, attribute, 0);
+                elementAccessor->add_attribute(attribute, 0);
 
                 attribute = create_attribute_variable("reference", section, GRIB_TYPE_DOUBLE, 0, self->expanded->v[idx]->reference, 0, flags);
                 if (!attribute)
                     return NULL;
-                grib_accessor_add_attribute(elementAccessor, attribute, 0);
+                elementAccessor->add_attribute(attribute, 0);
 
                 attribute = create_attribute_variable("width", section, GRIB_TYPE_LONG, 0, 0, self->expanded->v[idx]->width, flags);
                 if (!attribute)
                     return NULL;
-                grib_accessor_add_attribute(elementAccessor, attribute, 0);
+                elementAccessor->add_attribute(attribute, 0);
             }
             break;
     }
@@ -2179,19 +1957,18 @@ static grib_accessor* get_element_from_bitmap(const grib_accessor* a, bitmap_s*
     while (bitmapVal) {
         len = 1;
         if (bitmap->cursor && bitmap->cursor->accessor) {
-            ret = grib_unpack_long(bitmap->cursor->accessor, &bitmapVal, &len);
-        }
+            ret = bitmap->cursor->accessor->unpack_long(&bitmapVal, &len);        }
         else {
             return NULL;
         }
         if (ret != 0)
             return NULL;
-        bitmap->cursor = bitmap->cursor->next;
+        bitmap->cursor = bitmap->cursor->next_;
         if (bitmap->referredElement)
-            bitmap->referredElement = bitmap->referredElement->next;
+            bitmap->referredElement = bitmap->referredElement->next_;
     }
 
-    return bitmap->referredElement ? bitmap->referredElement->prev->accessor : NULL;
+    return bitmap->referredElement ? bitmap->referredElement->prev_->accessor : NULL;
 }
 
 // static GRIB_INLINE void reset_qualifiers(grib_accessor* significanceQualifierGroup[])
@@ -2201,8 +1978,7 @@ static grib_accessor* get_element_from_bitmap(const grib_accessor* a, bitmap_s*
 //         significanceQualifierGroup[i]=0;
 // }
 
-static void grib_convert_to_attribute(grib_accessor* a)
-{
+void grib_convert_to_attribute(grib_accessor* a){
     if (a->h == NULL && a->parent != NULL) {
         a->h      = grib_handle_of_accessor(a);
         a->parent = NULL;
@@ -2211,7 +1987,7 @@ static void grib_convert_to_attribute(grib_accessor* a)
 
 /* subsetList can be NULL in which case subsetListSize will be 0 */
 static grib_iarray* set_subset_list(
-        grib_context* c, grib_accessor_bufr_data_array* self,
+        grib_context* c, grib_accessor_bufr_data_array_t* self,
         long onlySubset, long startSubset, long endSubset, const long* subsetList, size_t subsetListSize)
 {
     grib_iarray* list = grib_iarray_new(c, self->numberOfSubsets, 10);
@@ -2249,8 +2025,7 @@ static grib_iarray* set_subset_list(
     return list;
 }
 
-static int bitmap_ref_skip(grib_accessors_list* al, int* err)
-{
+int bitmap_ref_skip(grib_accessors_list* al, int* err){
     grib_accessor* acode = NULL;
     long code[1];
     size_t l = 1;
@@ -2258,11 +2033,10 @@ static int bitmap_ref_skip(grib_accessors_list* al, int* err)
     if (!al || !al->accessor)
         return 0;
 
-    acode = grib_accessor_get_attribute(al->accessor, "code");
+    acode = al->accessor->get_attribute("code");
 
     if (acode)
-        *err = grib_unpack_long(acode, code, &l);
-    else
+        *err = acode->unpack_long(code, &l);    else
         return 1;
 
     switch (code[0]) {
@@ -2283,18 +2057,16 @@ static int bitmap_ref_skip(grib_accessors_list* al, int* err)
 }
 
 /* Return 1 if the descriptor is an operator marking the start of a bitmap */
-static int is_bitmap_start_descriptor(grib_accessors_list* al, int* err)
-{
+int is_bitmap_start_descriptor(grib_accessors_list* al, int* err){
     grib_accessor* acode = NULL;
     long code[1];
     size_t l = 1;
     if (!al || !al->accessor)
         return 0;
 
-    acode = grib_accessor_get_attribute(al->accessor, "code");
+    acode = al->accessor->get_attribute("code");
     if (acode)
-        *err = grib_unpack_long(acode, code, &l);
-    else
+        *err = acode->unpack_long(code, &l);    else
         return 1;
 
     switch (code[0]) {
@@ -2309,18 +2081,16 @@ static int is_bitmap_start_descriptor(grib_accessors_list* al, int* err)
             {
                 //long index[1];
                 //grib_accessor* anindex=grib_accessor_get_attribute(al->accessor,"index");
-                //grib_unpack_long(anindex,index,&l);
-                return 1;
+                //anindex->unpack_long(index,&l);                return 1;
             }
     }
     return 0;
 }
 
-static void print_bitmap_debug_info(grib_context* c, bitmap_s* bitmap, grib_accessors_list* bitmapStart, int bitmapSize)
-{
+void print_bitmap_debug_info(grib_context* c, bitmap_s* bitmap, grib_accessors_list* bitmapStart, int bitmapSize){
     int i = 0, ret = 0;
     fprintf(stderr, "ECCODES DEBUG: bitmap_init: bitmapSize=%d\n", bitmapSize);
-    bitmap->cursor          = bitmapStart->next;
+    bitmap->cursor          = bitmapStart->next_;
     bitmap->referredElement = bitmapStart;
 
     while (bitmap_ref_skip(bitmap->referredElement, &ret)) {
@@ -2328,7 +2098,7 @@ static void print_bitmap_debug_info(grib_context* c, bitmap_s* bitmap, grib_acce
         if (is_bitmap_start_descriptor(bitmap->referredElement, &ret)) {
             is_bmp = 1;
         }
-        bitmap->referredElement = bitmap->referredElement->prev;
+        bitmap->referredElement = bitmap->referredElement->prev_;
         if (is_bmp) {
             break;
         }
@@ -2337,7 +2107,7 @@ static void print_bitmap_debug_info(grib_context* c, bitmap_s* bitmap, grib_acce
     for (i = 1; i < bitmapSize; i++) {
         if (bitmap->referredElement) {
             fprintf(stderr, "ECCODES DEBUG:\t bitmap_init: i=%d |%s|\n", i, bitmap->referredElement->accessor->name);
-            bitmap->referredElement = bitmap->referredElement->prev;
+            bitmap->referredElement = bitmap->referredElement->prev_;
         }
     }
 }
@@ -2346,13 +2116,13 @@ static int bitmap_init(grib_context* c, bitmap_s* bitmap,
                        grib_accessors_list* bitmapStart, int bitmapSize, grib_accessors_list* lastAccessorInList)
 {
     int ret        = 0, i;
-    bitmap->cursor = bitmapStart->next;
+    bitmap->cursor = bitmapStart->next_;
     if (bitmap->referredElementStart != NULL) {
         bitmap->referredElement = bitmap->referredElementStart;
         return ret;
     }
     bitmap->referredElement = bitmapStart;
-    /*while (bitmap_ref_skip(bitmap->referredElement,&ret)) bitmap->referredElement=bitmap->referredElement->prev;*/
+    /*while (bitmap_ref_skip(bitmap->referredElement,&ret)) bitmap->referredElement=bitmap->referredElement->prev_;*/
     /* See ECC-869
      * We have to INCLUDE the replication factors that come after the bitmap operators
      */
@@ -2361,7 +2131,7 @@ static int bitmap_init(grib_context* c, bitmap_s* bitmap,
         if (is_bitmap_start_descriptor(bitmap->referredElement, &ret)) {
             is_bmp = 1;
         }
-        bitmap->referredElement = bitmap->referredElement->prev;
+        bitmap->referredElement = bitmap->referredElement->prev_;
         if (is_bmp) {
             break;
         }
@@ -2375,7 +2145,7 @@ static int bitmap_init(grib_context* c, bitmap_s* bitmap,
             return GRIB_INTERNAL_ERROR;
         }
         /*printf("  bitmap_init: i=%d  |%s|\n", i,bitmap->referredElement->accessor->name);*/
-        bitmap->referredElement = bitmap->referredElement->prev;
+        bitmap->referredElement = bitmap->referredElement->prev_;
     }
     bitmap->referredElementStart = bitmap->referredElement;
     return ret;
@@ -2383,13 +2153,13 @@ static int bitmap_init(grib_context* c, bitmap_s* bitmap,
 
 static grib_accessor* accessor_or_attribute_with_same_name(grib_accessor* a, const char* name)
 {
-    if (grib_accessor_has_attributes(a) == 0) {
+    if (a->has_attributes() == 0) {
         return a;
     }
     else {
         grib_accessor* ok = a;
         grib_accessor* next;
-        while ((next = grib_accessor_get_attribute(ok, name)) != NULL) {
+        while ((next = ok->get_attribute(name)) != NULL) {
             ok = next;
         }
         return ok;
@@ -2408,14 +2178,12 @@ static grib_accessor* accessor_or_attribute_with_same_name(grib_accessor* a, con
 //     return *r;
 // }
 
-static int grib_data_accessors_trie_push(grib_trie_with_rank* accessorsTrie, grib_accessor* a)
-{
+int grib_data_accessors_trie_push(grib_trie_with_rank* accessorsTrie, grib_accessor* a){
     return grib_trie_with_rank_insert(accessorsTrie, a->name, a);
 }
 
-static int create_keys(const grib_accessor* a, long onlySubset, long startSubset, long endSubset)
-{
-    grib_accessor_bufr_data_array* self = (grib_accessor_bufr_data_array*)a;
+int create_keys(const grib_accessor* a, long onlySubset, long startSubset, long endSubset){
+    grib_accessor_bufr_data_array_t* self = (grib_accessor_bufr_data_array_t*)a;
     int err                             = 0;
     int rank;
     grib_accessor* elementAccessor                     = 0;
@@ -2509,7 +2277,7 @@ static int create_keys(const grib_accessor* a, long onlySubset, long startSubset
         /*if (associatedFieldAccessor) grib_accessor_delete(c, associatedFieldAccessor);*/
         associatedFieldAccessor = NULL;
         if (associatedFieldSignificanceAccessor) {
-            grib_accessor_delete(c, associatedFieldSignificanceAccessor);
+            associatedFieldSignificanceAccessor->destroy(c);
             associatedFieldSignificanceAccessor = NULL;
         }
         for (ide = 0; ide < elementsInSubset; ide++) {
@@ -2577,7 +2345,7 @@ static int create_keys(const grib_accessor* a, long onlySubset, long startSubset
                     //return err;
                     bitmapIndex--;
                 }
-                bitmapStart[bitmapIndex] = grib_accessors_list_last(self->dataAccessors);
+                bitmapStart[bitmapIndex] = self->dataAccessors->last();
                 bitmapSize[bitmapIndex]  = 1;
                 if (self->expanded->v[idx - 1]->code == 31002 || self->expanded->v[idx - 1]->code == 31001)
                     extraElement += 1;
@@ -2659,11 +2427,10 @@ static int create_keys(const grib_accessor* a, long onlySubset, long startSubset
                 creatorsn.name = (char*)"subsetNumber";
                 asn            = grib_accessor_factory(section, &creatorsn, 0, NULL);
                 accessor_variable_set_type(asn, GRIB_TYPE_LONG);
-                grib_pack_long(asn, &subsetNumber, &len);
-
+                asn->pack_long(&subsetNumber, &len);
                 grib_push_accessor(asn, section->block);
                 rank = grib_data_accessors_trie_push(self->dataAccessorsTrie, asn);
-                grib_accessors_list_push(self->dataAccessors, asn, rank);
+                self->dataAccessors->push(asn, rank);
             }
             count++;
             elementAccessor = create_accessor_from_descriptor(a, associatedFieldAccessor, section, ide, iss,
@@ -2681,16 +2448,17 @@ static int create_keys(const grib_accessor* a, long onlySubset, long startSubset
             if (elementFromBitmap && self->unpackMode == CODES_BUFR_UNPACK_STRUCTURE) {
                 if (descriptor->code != 33007 && descriptor->code != 223255) {
                     char* aname                = grib_context_strdup(c, elementFromBitmap->name);
-                    grib_accessor* newAccessor = grib_accessor_clone(elementAccessor, section, &err);
+                    grib_accessor* newAccessor = elementAccessor->clone(section, &err);
                     newAccessor->parent        = groupSection;
                     newAccessor->name          = aname;
                     grib_sarray_push(a->context, self->tempStrings, aname);
                     grib_push_accessor(newAccessor, groupSection->block);
                     rank = grib_data_accessors_trie_push(self->dataAccessorsTrie, newAccessor);
-                    grib_accessors_list_push(self->dataAccessors, newAccessor, rank);
+                    self->dataAccessors->push(newAccessor, rank);
                 }
 
-                err = grib_accessor_add_attribute(accessor_or_attribute_with_same_name(elementFromBitmap, elementAccessor->name), elementAccessor, 1);
+                //err = grib_accessor_add_attribute(accessor_or_attribute_with_same_name(elementFromBitmap, elementAccessor->name), elementAccessor, 1);
+                err = accessor_or_attribute_with_same_name(elementFromBitmap, elementAccessor->name)->add_attribute( elementAccessor, 1);
             }
             else if (elementAccessor) {
                 int add_key = 1;
@@ -2700,17 +2468,17 @@ static int create_keys(const grib_accessor* a, long onlySubset, long startSubset
                         associatedFieldAccessor = elementAccessor;
                         grib_convert_to_attribute(associatedFieldAccessor);
                         if (associatedFieldSignificanceAccessor) {
-                            grib_accessor* newAccessor = grib_accessor_clone(associatedFieldSignificanceAccessor, section, &err);
+                            grib_accessor* newAccessor = associatedFieldSignificanceAccessor->clone(section, &err);
                             if (err) {
                                 grib_context_log(a->context, GRIB_LOG_ERROR,"Unable to clone accessor '%s'\n", associatedFieldSignificanceAccessor->name);
                                 return err;
                             }
-                            grib_accessor_add_attribute(associatedFieldAccessor, newAccessor, 1);
+                            associatedFieldAccessor->add_attribute(newAccessor, 1);
                         }
                         break;
                     case 31021:
                         if (associatedFieldSignificanceAccessor)
-                            grib_accessor_delete(c, associatedFieldSignificanceAccessor);
+                            associatedFieldSignificanceAccessor->destroy(c);
                         associatedFieldSignificanceAccessor = elementAccessor;
                         break;
                         /*case 33007:*/
@@ -2728,8 +2496,8 @@ static int create_keys(const grib_accessor* a, long onlySubset, long startSubset
                         if (add_key) {
                             grib_push_accessor(elementAccessor, section->block);
                             rank = grib_data_accessors_trie_push(self->dataAccessorsTrie, elementAccessor);
-                            grib_accessors_list_push(self->dataAccessors, elementAccessor, rank);
-                            lastAccessorInList = grib_accessors_list_last(self->dataAccessors);
+                            self->dataAccessors->push(elementAccessor, rank);
+                            lastAccessorInList = self->dataAccessors->last();
                         }
                 }
             }
@@ -2739,8 +2507,7 @@ static int create_keys(const grib_accessor* a, long onlySubset, long startSubset
     return err;
 }
 
-static void set_input_replications(grib_handle* h, grib_accessor_bufr_data_array* self)
-{
+void set_input_replications(grib_handle* h, grib_accessor_bufr_data_array_t* self){
     size_t nInputReplications;
     size_t nInputExtendedReplications;
     size_t nInputShortReplications;
@@ -2785,8 +2552,7 @@ static void set_input_replications(grib_handle* h, grib_accessor_bufr_data_array
     }
 }
 
-static void set_input_bitmap(grib_handle* h, grib_accessor_bufr_data_array* self)
-{
+void set_input_bitmap(grib_handle* h, grib_accessor_bufr_data_array_t* self){
     size_t nInputBitmap;
     self->nInputBitmap = -1;
     self->iInputBitmap = 0;
@@ -2803,8 +2569,7 @@ static void set_input_bitmap(grib_handle* h, grib_accessor_bufr_data_array* self
     }
 }
 
-static int set_to_missing_if_out_of_range(grib_handle* h)
-{
+int set_to_missing_if_out_of_range(grib_handle* h){
     /* First check if the transient key is set */
     long setToMissingIfOutOfRange = 0;
     if (grib_get_long(h, "setToMissingIfOutOfRange", &setToMissingIfOutOfRange) == GRIB_SUCCESS &&
@@ -2815,8 +2580,7 @@ static int set_to_missing_if_out_of_range(grib_handle* h)
     return h->context->bufr_set_to_missing_if_out_of_range;
 }
 
-static int process_elements(grib_accessor* a, int flag, long onlySubset, long startSubset, long endSubset)
-{
+int process_elements(grib_accessor* a, int flag, long onlySubset, long startSubset, long endSubset){
     int err = 0;
     long inr, innr, ir, ip;
     long n[MAX_NESTED_REPLICATIONS] = {0,};
@@ -2846,7 +2610,7 @@ static int process_elements(grib_accessor* a, int flag, long onlySubset, long st
 
     grib_darray* dval                   = NULL;
     grib_sarray* sval                   = NULL;
-    grib_accessor_bufr_data_array* self = (grib_accessor_bufr_data_array*)a;
+    grib_accessor_bufr_data_array_t* self = (grib_accessor_bufr_data_array_t*)a;
 
     grib_handle* h  = grib_handle_of_accessor(a);
     grib_context* c = h->context;
@@ -3373,19 +3137,17 @@ static int process_elements(grib_accessor* a, int flag, long onlySubset, long st
     return err;
 }
 
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    // grib_accessor_bufr_data_array *self =(grib_accessor_bufr_data_array*)a;
+void grib_accessor_class_bufr_data_array_t::dump(grib_accessor* a, grib_dumper* dumper){
+    // grib_accessor_bufr_data_array_t *self =(grib_accessor_bufr_data_array_t*)a;
     // int err=process_elements(a,PROCESS_DECODE);
     // grib_dump_section(dumper,a,self->dataKeys->block);
     return;
 }
 
-static int value_count(grib_accessor* a, long* count)
-{
+int grib_accessor_class_bufr_data_array_t::value_count(grib_accessor* a, long* count){
     int err = 0, l;
     long i;
-    grib_accessor_bufr_data_array* self = (grib_accessor_bufr_data_array*)a;
+    grib_accessor_bufr_data_array_t* self = (grib_accessor_bufr_data_array_t*)a;
 
     err = process_elements(a, PROCESS_DECODE, 0, 0, 0);
     if (err)
@@ -3405,13 +3167,12 @@ static int value_count(grib_accessor* a, long* count)
     return err;
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
+int grib_accessor_class_bufr_data_array_t::unpack_double(grib_accessor* a, double* val, size_t* len){
     int err                             = 0, i, k, ii;
     int proc_flag                       = PROCESS_DECODE;
     size_t l                            = 0, elementsInSubset;
     long numberOfSubsets                = 0;
-    grib_accessor_bufr_data_array* self = (grib_accessor_bufr_data_array*)a;
+    grib_accessor_bufr_data_array_t* self = (grib_accessor_bufr_data_array_t*)a;
 
     if (self->unpackMode == CODES_BUFR_NEW_DATA)
         proc_flag = PROCESS_NEW_DATA;
@@ -3459,9 +3220,8 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static void destroy(grib_context* c, grib_accessor* a)
-{
-    grib_accessor_bufr_data_array* self = (grib_accessor_bufr_data_array*)a;
+void grib_accessor_class_bufr_data_array_t::destroy(grib_context* c, grib_accessor* a){
+    grib_accessor_bufr_data_array_t* self = (grib_accessor_bufr_data_array_t*)a;
     self_clear(c, self);
     if (self->dataAccessors)
         grib_accessors_list_delete(c, self->dataAccessors);
diff --git a/src/accessor/grib_accessor_class_bufr_data_array.h b/src/accessor/grib_accessor_class_bufr_data_array.h
new file mode 100644
index 000000000..386d4ce9c
--- /dev/null
+++ b/src/accessor/grib_accessor_class_bufr_data_array.h
@@ -0,0 +1,93 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_bufr_data_array_h
+#define eccodes_accessor_bufr_data_array_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_bufr_data_array_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in bufr_data_array */
+    const char* bufrDataEncodedName;
+    const char* numberOfSubsetsName;
+    const char* expandedDescriptorsName;
+    const char* flagsName;
+    const char* unitsName;
+    const char* elementsDescriptorsIndexName;
+    const char* compressedDataName;
+    bufr_descriptors_array* expanded;
+    grib_accessor* expandedAccessor;
+    int* canBeMissing;
+    long numberOfSubsets;
+    long compressedData;
+    grib_vdarray* numericValues;
+    grib_vsarray* stringValues;
+    grib_viarray* elementsDescriptorsIndex;
+    int do_decode;
+    int bitmapStartElementsDescriptorsIndex;
+    int bitmapCurrentElementsDescriptorsIndex;
+    int bitmapSize;
+    int bitmapStart;
+    int bitmapCurrent;
+    grib_accessors_list* dataAccessors;
+    int unpackMode;
+    int bitsToEndData;
+    grib_section* dataKeys;
+    double* inputBitmap;
+    int nInputBitmap;
+    int iInputBitmap;
+    long* inputReplications;
+    int nInputReplications;
+    int iInputReplications;
+    long* inputExtendedReplications;
+    int nInputExtendedReplications;
+    int iInputExtendedReplications;
+    long* inputShortReplications;
+    int nInputShortReplications;
+    int iInputShortReplications;
+    grib_iarray* iss_list;
+    grib_trie_with_rank* dataAccessorsTrie;
+    grib_sarray* tempStrings;
+    grib_vdarray* tempDoubleValues;
+    int change_ref_value_operand;
+    size_t refValListSize;
+    long* refValList;
+    long refValIndex;
+    bufr_tableb_override* tableb_override;
+    int set_to_missing_if_out_of_range;
+};
+
+class grib_accessor_class_bufr_data_array_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_bufr_data_array_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_bufr_data_array_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    long byte_count(grib_accessor*) override;
+    long byte_offset(grib_accessor*) override;
+    long next_offset(grib_accessor*) override;
+    int value_count(grib_accessor*, long*) override;
+    void destroy(grib_context*, grib_accessor*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+
+grib_vsarray* accessor_bufr_data_array_get_stringValues(grib_accessor* a);
+grib_accessors_list* accessor_bufr_data_array_get_dataAccessors(grib_accessor* a);
+grib_trie_with_rank* accessor_bufr_data_array_get_dataAccessorsTrie(grib_accessor* a);
+void accessor_bufr_data_array_set_unpackMode(grib_accessor* a, int unpackMode);
+#endif /* eccodes_accessor_bufr_data_array_h */
diff --git a/src/accessor/todo/grib_accessor_class_bufr_data_element.cc b/src/accessor/grib_accessor_class_bufr_data_element.cc
similarity index 68%
rename from src/accessor/todo/grib_accessor_class_bufr_data_element.cc
rename to src/accessor/grib_accessor_class_bufr_data_element.cc
index 3301eb10f..295c0b13e 100644
--- a/src/accessor/todo/grib_accessor_class_bufr_data_element.cc
+++ b/src/accessor/grib_accessor_class_bufr_data_element.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,144 +9,19 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-/*****************************************
- *  Enrico Fucile
- ****************************************/
-
 #include "grib_api_internal.h"
+#include "grib_accessor_class_bufr_data_element.h"
 
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = init;dump
-   IMPLEMENTS = unpack_string;unpack_string_array;unpack_long; unpack_double
-   IMPLEMENTS = unpack_double_element ; is_missing
-   IMPLEMENTS = pack_long; pack_double ; pack_string_array; pack_string; pack_missing
-   IMPLEMENTS = value_count; get_native_type; make_clone; destroy
-   MEMBERS    = long index
-   MEMBERS    = int type
-   MEMBERS    = long compressedData
-   MEMBERS    = long subsetNumber
-   MEMBERS    = long numberOfSubsets
-   MEMBERS    = bufr_descriptors_array* descriptors
-   MEMBERS    = grib_vdarray* numericValues
-   MEMBERS    = grib_vsarray* stringValues
-   MEMBERS    = grib_viarray* elementsDescriptorsIndex
-   MEMBERS    = char* cname
-
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_missing(grib_accessor*);
-static int is_missing(grib_accessor*);
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int pack_string(grib_accessor*, const char*, size_t* len);
-static int pack_string_array(grib_accessor*, const char**, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static int unpack_string_array(grib_accessor*, char**, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void destroy(grib_context*, grib_accessor*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static int unpack_double_element(grib_accessor*, size_t i, double* val);
-static grib_accessor* make_clone(grib_accessor*, grib_section*, int*);
-
-typedef struct grib_accessor_bufr_data_element
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in bufr_data_element */
-    long index;
-    int type;
-    long compressedData;
-    long subsetNumber;
-    long numberOfSubsets;
-    bufr_descriptors_array* descriptors;
-    grib_vdarray* numericValues;
-    grib_vsarray* stringValues;
-    grib_viarray* elementsDescriptorsIndex;
-    char* cname;
-} grib_accessor_bufr_data_element;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_bufr_data_element = {
-    &grib_accessor_class_gen,                      /* super */
-    "bufr_data_element",                      /* name */
-    sizeof(grib_accessor_bufr_data_element),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    &destroy,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    &pack_missing,               /* pack_missing */
-    &is_missing,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    &pack_string,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    &pack_string_array,          /* pack_string_array */
-    &unpack_string_array,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    &unpack_double_element,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    &make_clone,                 /* clone accessor */
-};
-
-
+grib_accessor_class_bufr_data_element_t _grib_accessor_class_bufr_data_element{"bufr_data_element"};
 grib_accessor_class* grib_accessor_class_bufr_data_element = &_grib_accessor_class_bufr_data_element;
 
-/* END_CLASS_IMP */
 
 static grib_accessor* make_clone(grib_accessor* a, grib_section* s, int* err)
 {
     grib_accessor* the_clone = NULL;
     grib_accessor* attribute = NULL;
-    grib_accessor_bufr_data_element* elementAccessor;
-    grib_accessor_bufr_data_element* self;
+    grib_accessor_bufr_data_element_t* elementAccessor;
+    grib_accessor_bufr_data_element_t* self;
     char* copied_name = NULL;
     int i;
     grib_action creator = {0,};
@@ -161,8 +37,8 @@ static grib_accessor* make_clone(grib_accessor* a, grib_section* s, int* err)
     the_clone                                 = grib_accessor_factory(s, &creator, 0, NULL);
     copied_name                               = grib_context_strdup(a->context, a->name);
     the_clone->name                           = copied_name;
-    elementAccessor                           = (grib_accessor_bufr_data_element*)the_clone;
-    self                                      = (grib_accessor_bufr_data_element*)a;
+    elementAccessor                           = (grib_accessor_bufr_data_element_t*)the_clone;
+    self                                      = (grib_accessor_bufr_data_element_t*)a;
     the_clone->flags                          = a->flags;
     the_clone->parent                         = NULL;
     the_clone->h                              = s->h;
@@ -179,9 +55,9 @@ static grib_accessor* make_clone(grib_accessor* a, grib_section* s, int* err)
 
     i = 0;
     while (a->attributes[i]) {
-        attribute = grib_accessor_clone(a->attributes[i], s, err);
+        attribute = a->attributes[i]->clone(s, err);
         /* attribute->parent=a->parent; */
-        grib_accessor_add_attribute(the_clone, attribute, 0);
+        the_clone->add_attribute(attribute, 0);
         i++;
     }
 
@@ -190,69 +66,67 @@ static grib_accessor* make_clone(grib_accessor* a, grib_section* s, int* err)
 
 void accessor_bufr_data_element_set_index(grib_accessor* a, long index)
 {
-    grib_accessor_bufr_data_element* self = (grib_accessor_bufr_data_element*)a;
+    grib_accessor_bufr_data_element_t* self = (grib_accessor_bufr_data_element_t*)a;
     self->index = index;
 }
 
 void accessor_bufr_data_element_set_type(grib_accessor* a, int type)
 {
-    grib_accessor_bufr_data_element* self = (grib_accessor_bufr_data_element*)a;
+    grib_accessor_bufr_data_element_t* self = (grib_accessor_bufr_data_element_t*)a;
     self->type = type;
 }
 
 void accessor_bufr_data_element_set_numberOfSubsets(grib_accessor* a, long numberOfSubsets)
 {
-    grib_accessor_bufr_data_element* self = (grib_accessor_bufr_data_element*)a;
+    grib_accessor_bufr_data_element_t* self = (grib_accessor_bufr_data_element_t*)a;
     self->numberOfSubsets = numberOfSubsets;
 }
 
 void accessor_bufr_data_element_set_subsetNumber(grib_accessor* a, long subsetNumber)
 {
-    grib_accessor_bufr_data_element* self = (grib_accessor_bufr_data_element*)a;
+    grib_accessor_bufr_data_element_t* self = (grib_accessor_bufr_data_element_t*)a;
     self->subsetNumber = subsetNumber;
 }
 
 void accessor_bufr_data_element_set_compressedData(grib_accessor* a, int compressedData)
 {
-    grib_accessor_bufr_data_element* self = (grib_accessor_bufr_data_element*)a;
+    grib_accessor_bufr_data_element_t* self = (grib_accessor_bufr_data_element_t*)a;
     self->compressedData = compressedData;
 }
 
 void accessor_bufr_data_element_set_descriptors(grib_accessor* a, bufr_descriptors_array* descriptors)
 {
-    grib_accessor_bufr_data_element* self = (grib_accessor_bufr_data_element*)a;
+    grib_accessor_bufr_data_element_t* self = (grib_accessor_bufr_data_element_t*)a;
     self->descriptors = descriptors;
 }
 
 void accessor_bufr_data_element_set_numericValues(grib_accessor* a, grib_vdarray* numericValues)
 {
-    grib_accessor_bufr_data_element* self = (grib_accessor_bufr_data_element*)a;
+    grib_accessor_bufr_data_element_t* self = (grib_accessor_bufr_data_element_t*)a;
     self->numericValues = numericValues;
 }
 
 void accessor_bufr_data_element_set_stringValues(grib_accessor* a, grib_vsarray* stringValues)
 {
-    grib_accessor_bufr_data_element* self = (grib_accessor_bufr_data_element*)a;
+    grib_accessor_bufr_data_element_t* self = (grib_accessor_bufr_data_element_t*)a;
     self->stringValues = stringValues;
 }
 
 void accessor_bufr_data_element_set_elementsDescriptorsIndex(grib_accessor* a, grib_viarray* elementsDescriptorsIndex)
 {
-    grib_accessor_bufr_data_element* self = (grib_accessor_bufr_data_element*)a;
+    grib_accessor_bufr_data_element_t* self = (grib_accessor_bufr_data_element_t*)a;
     self->elementsDescriptorsIndex = elementsDescriptorsIndex;
 }
 
-static void init(grib_accessor* a, const long len, grib_arguments* params)
-{
-    grib_accessor_bufr_data_element* self = (grib_accessor_bufr_data_element*)a;
+void grib_accessor_class_bufr_data_element_t::init(grib_accessor* a, const long len, grib_arguments* params){
+    grib_accessor_bufr_data_element_t* self = (grib_accessor_bufr_data_element_t*)a;
     a->length = 0;
     a->flags |= GRIB_ACCESSOR_FLAG_BUFR_DATA;
     /* a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY; */
     self->cname = NULL;
 }
 
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
+void grib_accessor_class_bufr_data_element_t::dump(grib_accessor* a, grib_dumper* dumper){
     int type = get_native_type(a);
 
     switch (type) {
@@ -268,9 +142,8 @@ static void dump(grib_accessor* a, grib_dumper* dumper)
     }
 }
 
-static int unpack_string_array(grib_accessor* a, char** val, size_t* len)
-{
-    grib_accessor_bufr_data_element* self = (grib_accessor_bufr_data_element*)a;
+int grib_accessor_class_bufr_data_element_t::unpack_string_array(grib_accessor* a, char** val, size_t* len){
+    grib_accessor_bufr_data_element_t* self = (grib_accessor_bufr_data_element_t*)a;
 
     int ret = 0, idx = 0;
     size_t count = 0, i = 0;
@@ -297,9 +170,8 @@ static int unpack_string_array(grib_accessor* a, char** val, size_t* len)
     return ret;
 }
 
-static int pack_string_array(grib_accessor* a, const char** v, size_t* len)
-{
-    grib_accessor_bufr_data_element* self = (grib_accessor_bufr_data_element*)a;
+int grib_accessor_class_bufr_data_element_t::pack_string_array(grib_accessor* a, const char** v, size_t* len){
+    grib_accessor_bufr_data_element_t* self = (grib_accessor_bufr_data_element_t*)a;
 
     int ret = GRIB_SUCCESS, idx = 0;
     size_t i = 0;
@@ -340,9 +212,8 @@ static int pack_string_array(grib_accessor* a, const char** v, size_t* len)
     return ret;
 }
 
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    grib_accessor_bufr_data_element* self = (grib_accessor_bufr_data_element*)a;
+int grib_accessor_class_bufr_data_element_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    grib_accessor_bufr_data_element_t* self = (grib_accessor_bufr_data_element_t*)a;
     char* str = NULL;
     char* p = 0;
     size_t slen = 0;
@@ -409,9 +280,8 @@ static int unpack_string(grib_accessor* a, char* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int pack_string(grib_accessor* a, const char* val, size_t* len)
-{
-    grib_accessor_bufr_data_element* self = (grib_accessor_bufr_data_element*)a;
+int grib_accessor_class_bufr_data_element_t::pack_string(grib_accessor* a, const char* val, size_t* len){
+    grib_accessor_bufr_data_element_t* self = (grib_accessor_bufr_data_element_t*)a;
 
     int ret = GRIB_SUCCESS, idx = 0;
     char* s = NULL;
@@ -432,9 +302,8 @@ static int pack_string(grib_accessor* a, const char* val, size_t* len)
     return ret;
 }
 
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_bufr_data_element* self = (grib_accessor_bufr_data_element*)a;
+int grib_accessor_class_bufr_data_element_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_bufr_data_element_t* self = (grib_accessor_bufr_data_element_t*)a;
     int ret = GRIB_SUCCESS;
     long count = 0, i = 0;
 
@@ -461,9 +330,8 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
     return ret;
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_bufr_data_element* self = (grib_accessor_bufr_data_element*)a;
+int grib_accessor_class_bufr_data_element_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_bufr_data_element_t* self = (grib_accessor_bufr_data_element_t*)a;
     int ret = GRIB_SUCCESS;
     long count = 0, i = 0;
 
@@ -490,9 +358,8 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     return ret;
 }
 
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_bufr_data_element* self = (grib_accessor_bufr_data_element*)a;
+int grib_accessor_class_bufr_data_element_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_bufr_data_element_t* self = (grib_accessor_bufr_data_element_t*)a;
     int ret = GRIB_SUCCESS;
     size_t count = 1, i = 0;
     grib_context* c = a->context;
@@ -520,9 +387,8 @@ static int pack_double(grib_accessor* a, const double* val, size_t* len)
     return ret;
 }
 
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_bufr_data_element* self = (grib_accessor_bufr_data_element*)a;
+int grib_accessor_class_bufr_data_element_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_bufr_data_element_t* self = (grib_accessor_bufr_data_element_t*)a;
     int ret = 0;
     size_t count = 1, i = 0;
     grib_context* c = a->context;
@@ -550,11 +416,10 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
     return ret;
 }
 
-static int value_count(grib_accessor* a, long* count)
-{
+int grib_accessor_class_bufr_data_element_t::value_count(grib_accessor* a, long* count){
     int ret = 0, type = 0, idx = 0;
     size_t size = 0;
-    grib_accessor_bufr_data_element* self = (grib_accessor_bufr_data_element*)a;
+    grib_accessor_bufr_data_element_t* self = (grib_accessor_bufr_data_element_t*)a;
 
     if (!self->compressedData) {
         *count = 1;
@@ -577,10 +442,9 @@ static int value_count(grib_accessor* a, long* count)
     return ret;
 }
 
-static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
-{
+int grib_accessor_class_bufr_data_element_t::unpack_double_element(grib_accessor* a, size_t idx, double* val){
     /* ECC-415 */
-    grib_accessor_bufr_data_element* self = (grib_accessor_bufr_data_element*)a;
+    grib_accessor_bufr_data_element_t* self = (grib_accessor_bufr_data_element_t*)a;
     int ret = GRIB_SUCCESS;
     long count = 0;
 
@@ -598,9 +462,8 @@ static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
     return ret;
 }
 
-static int get_native_type(grib_accessor* a)
-{
-    grib_accessor_bufr_data_element* self = (grib_accessor_bufr_data_element*)a;
+int grib_accessor_class_bufr_data_element_t::get_native_type(grib_accessor* a){
+    grib_accessor_bufr_data_element_t* self = (grib_accessor_bufr_data_element_t*)a;
     int ret = GRIB_TYPE_DOUBLE;
     DEBUG_ASSERT(self);
     switch (self->type) {
@@ -624,16 +487,15 @@ static int get_native_type(grib_accessor* a)
     return ret;
 }
 
-static void destroy(grib_context* ct, grib_accessor* a)
-{
-    grib_accessor_bufr_data_element* self = (grib_accessor_bufr_data_element*)a;
+void grib_accessor_class_bufr_data_element_t::destroy(grib_context* ct, grib_accessor* a){
+    grib_accessor_bufr_data_element_t* self = (grib_accessor_bufr_data_element_t*)a;
     int i = 0;
     if (self->cname)
         grib_context_free(ct, self->cname); /* ECC-765 */
     while (i < MAX_ACCESSOR_ATTRIBUTES && a->attributes[i]) {
         /*grib_context_log(ct,GRIB_LOG_DEBUG,"deleting attribute %s->%s",a->name,a->attributes[i]->name);*/
         /*printf("bufr_data_element destroy %s %p\n", a->attributes[i]->name, (void*)a->attributes[i]);*/
-        grib_accessor_delete(ct, a->attributes[i]);
+        a->attributes[i]->destroy(ct);
         a->attributes[i] = NULL;
         i++;
     }
@@ -641,8 +503,7 @@ static void destroy(grib_context* ct, grib_accessor* a)
 
 #define MAX_STRING_SIZE 4096
 /* Return 1 if BUFR element(s) is/are missing, 0 otherwise. In case of decoding errors, also return 0 */
-static int is_missing(grib_accessor* a)
-{
+int grib_accessor_class_bufr_data_element_t::is_missing(grib_accessor* a){
     const int ktype = get_native_type(a);
     int err = 0, result = 1; /* default: assume all are missing */
     long count = 0;
@@ -657,11 +518,9 @@ static int is_missing(grib_accessor* a)
         size = size2 = count;
         if (size > 1) {
             values = (long*)grib_context_malloc_clear(c, sizeof(long) * size);
-            err = grib_unpack_long(a, values, &size2);
-        }
+            err = a->unpack_long(values, &size2);        }
         else {
-            err = grib_unpack_long(a, &value, &size2);
-        }
+            err = a->unpack_long(&value, &size2);        }
         if (err) return 0; /* TODO: no way of propagating the error up */
         Assert(size2 == size);
         if (size > 1) {
@@ -684,11 +543,9 @@ static int is_missing(grib_accessor* a)
         size = size2 = count;
         if (size > 1) {
             values = (double*)grib_context_malloc_clear(c, sizeof(double) * size);
-            err = grib_unpack_double(a, values, &size2);
-        }
+            err = a->unpack_double(values, &size2);        }
         else {
-            err = grib_unpack_double(a, &value, &size2);
-        }
+            err = a->unpack_double(&value, &size2);        }
         if (err) return 0; /* TODO: no way of propagating the error up */
         Assert(size2 == size);
         if (size > 1) {
@@ -710,8 +567,7 @@ static int is_missing(grib_accessor* a)
         size = count;
         if (size > 1) {
             values = (char**)grib_context_malloc_clear(a->context, size * sizeof(char*));
-            err = grib_unpack_string_array(a, values, &size);
-            if (err) return 0; /* TODO: no way of propagating the error up */
+            err = a->unpack_string_array(values, &size);            if (err) return 0; /* TODO: no way of propagating the error up */
             for (i = 0; i < size; i++) {
                 if (!grib_is_missing_string(a, (unsigned char*)values[i], size)) {
                     result = 0;
@@ -723,8 +579,7 @@ static int is_missing(grib_accessor* a)
         } else {
             char value[MAX_STRING_SIZE] = {0,}; /* See ECC-710 */
             size = MAX_STRING_SIZE;
-            err = grib_unpack_string(a, value, &size);
-            if (err) return 0; /* TODO: no way of propagating the error up */
+            err = a->unpack_string(value, &size);            if (err) return 0; /* TODO: no way of propagating the error up */
             result = grib_is_missing_string(a, (unsigned char*)value, size);
         }
     }
@@ -734,8 +589,7 @@ static int is_missing(grib_accessor* a)
     return result;
 }
 
-static int pack_missing(grib_accessor* a)
-{
+int grib_accessor_class_bufr_data_element_t::pack_missing(grib_accessor* a){
     int ktype = GRIB_TYPE_UNDEFINED;
     int err = 0;
     size_t size = 1;
diff --git a/src/accessor/grib_accessor_class_bufr_data_element.h b/src/accessor/grib_accessor_class_bufr_data_element.h
new file mode 100644
index 000000000..d75afbe03
--- /dev/null
+++ b/src/accessor/grib_accessor_class_bufr_data_element.h
@@ -0,0 +1,56 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_bufr_data_element_h
+#define eccodes_accessor_bufr_data_element_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_bufr_data_element_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in bufr_data_element */
+    long index;
+    int type;
+    long compressedData;
+    long subsetNumber;
+    long numberOfSubsets;
+    bufr_descriptors_array* descriptors;
+    grib_vdarray* numericValues;
+    grib_vsarray* stringValues;
+    grib_viarray* elementsDescriptorsIndex;
+    char* cname;
+};
+
+class grib_accessor_class_bufr_data_element_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_bufr_data_element_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_bufr_data_element_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_missing(grib_accessor*) override;
+    int is_missing(grib_accessor*) override;
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int pack_string(grib_accessor*, const char*, size_t* len) override;
+    int pack_string_array(grib_accessor*, const char**, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    int unpack_string_array(grib_accessor*, char**, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void destroy(grib_context*, grib_accessor*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    int unpack_double_element(grib_accessor*, size_t i, double* val) override;
+};
+#endif /* eccodes_accessor_bufr_data_element_h */
diff --git a/src/accessor/todo/grib_accessor_class_bufr_elements_table.cc b/src/accessor/grib_accessor_class_bufr_elements_table.cc
similarity index 68%
rename from src/accessor/todo/grib_accessor_class_bufr_elements_table.cc
rename to src/accessor/grib_accessor_class_bufr_elements_table.cc
index 4858ff63d..9b589c114 100644
--- a/src/accessor/todo/grib_accessor_class_bufr_elements_table.cc
+++ b/src/accessor/grib_accessor_class_bufr_elements_table.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,12 +9,10 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-/*****************************************
- *  Enrico Fucile
- ****************************************/
-
-#include "grib_scaling.h"
 #include "grib_api_internal.h"
+#include "grib_accessor_class_bufr_elements_table.h"
+#include "grib_scaling.h"
+
 
 #if GRIB_PTHREADS
 static pthread_once_t once    = PTHREAD_ONCE_INIT;
@@ -31,7 +30,7 @@ static void thread_init()
 static int once = 0;
 static omp_nest_lock_t mutex1;
 
-static void thread_init()
+void thread_init()
 {
     GRIB_OMP_CRITICAL(lock_grib_accessor_class_bufr_elements_table_c)
     {
@@ -43,107 +42,14 @@ static void thread_init()
 }
 #endif
 
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = init;unpack_string;unpack_long;unpack_double
-   IMPLEMENTS = value_count; get_native_type;
-   MEMBERS    =  const char* dictionary
-   MEMBERS    =  const char* masterDir
-   MEMBERS    =  const char* localDir
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_bufr_elements_table
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in bufr_elements_table */
-    const char* dictionary;
-    const char* masterDir;
-    const char* localDir;
-} grib_accessor_bufr_elements_table;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_bufr_elements_table = {
-    &grib_accessor_class_gen,                      /* super */
-    "bufr_elements_table",                      /* name */
-    sizeof(grib_accessor_bufr_elements_table),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
 
+grib_accessor_class_bufr_elements_table_t _grib_accessor_class_bufr_elements_table{"bufr_elements_table"};
 grib_accessor_class* grib_accessor_class_bufr_elements_table = &_grib_accessor_class_bufr_elements_table;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long len, grib_arguments* params)
-{
+void grib_accessor_class_bufr_elements_table_t::init(grib_accessor* a, const long len, grib_arguments* params){
     int n                                   = 0;
-    grib_accessor_bufr_elements_table* self = (grib_accessor_bufr_elements_table*)a;
+    grib_accessor_bufr_elements_table_t* self = (grib_accessor_bufr_elements_table_t*)a;
 
     self->dictionary = grib_arguments_get_string(grib_handle_of_accessor(a), params, n++);
     self->masterDir  = grib_arguments_get_name(grib_handle_of_accessor(a), params, n++);
@@ -155,7 +61,7 @@ static void init(grib_accessor* a, const long len, grib_arguments* params)
 
 static grib_trie* load_bufr_elements_table(grib_accessor* a, int* err)
 {
-    grib_accessor_bufr_elements_table* self = (grib_accessor_bufr_elements_table*)a;
+    grib_accessor_bufr_elements_table_t* self = (grib_accessor_bufr_elements_table_t*)a;
 
     char* filename  = NULL;
     char line[1024] = {0,};
@@ -273,8 +179,7 @@ the_end:
     return dictionary;
 }
 
-static int convert_type(const char* stype)
-{
+int convert_type(const char* stype){
     int ret = BUFR_DESCRIPTOR_TYPE_UNKNOWN;
     switch (stype[0]) {
         case 's':
@@ -304,14 +209,13 @@ static int convert_type(const char* stype)
     return ret;
 }
 
-static long atol_fast(const char* input)
-{
+long atol_fast(const char* input){
     if (strcmp(input, "0") == 0)
         return 0;
     return atol(input);
 }
-static int bufr_get_from_table(grib_accessor* a, bufr_descriptor* v)
-{
+
+int bufr_get_from_table(grib_accessor* a, bufr_descriptor* v){
     int ret      = 0;
     char** list  = 0;
     char code[7] = { 0 };
@@ -407,28 +311,23 @@ bufr_descriptor* accessor_bufr_elements_table_get_descriptor(grib_accessor* a, i
     return v;
 }
 
-static int unpack_string(grib_accessor* a, char* buffer, size_t* len)
-{
+int grib_accessor_class_bufr_elements_table_t::unpack_string(grib_accessor* a, char* buffer, size_t* len){
     return GRIB_NOT_IMPLEMENTED;
 }
 
-static int value_count(grib_accessor* a, long* count)
-{
+int grib_accessor_class_bufr_elements_table_t::value_count(grib_accessor* a, long* count){
     *count = 1;
     return 0;
 }
 
-static int get_native_type(grib_accessor* a)
-{
+int grib_accessor_class_bufr_elements_table_t::get_native_type(grib_accessor* a){
     return GRIB_TYPE_STRING;
 }
 
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
+int grib_accessor_class_bufr_elements_table_t::unpack_long(grib_accessor* a, long* val, size_t* len){
     return GRIB_NOT_IMPLEMENTED;
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
+int grib_accessor_class_bufr_elements_table_t::unpack_double(grib_accessor* a, double* val, size_t* len){
     return GRIB_NOT_IMPLEMENTED;
 }
diff --git a/src/accessor/grib_accessor_class_bufr_elements_table.h b/src/accessor/grib_accessor_class_bufr_elements_table.h
new file mode 100644
index 000000000..8ddd8a824
--- /dev/null
+++ b/src/accessor/grib_accessor_class_bufr_elements_table.h
@@ -0,0 +1,39 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_bufr_elements_table_h
+#define eccodes_accessor_bufr_elements_table_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_bufr_elements_table_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in bufr_elements_table */
+    const char* dictionary;
+    const char* masterDir;
+    const char* localDir;
+};
+
+class grib_accessor_class_bufr_elements_table_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_bufr_elements_table_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_bufr_elements_table_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_bufr_elements_table_h */
diff --git a/src/accessor/todo/grib_accessor_class_bufr_extract_area_subsets.cc b/src/accessor/grib_accessor_class_bufr_extract_area_subsets.cc
similarity index 57%
rename from src/accessor/todo/grib_accessor_class_bufr_extract_area_subsets.cc
rename to src/accessor/grib_accessor_class_bufr_extract_area_subsets.cc
index 473a5148d..85eb98d0d 100644
--- a/src/accessor/todo/grib_accessor_class_bufr_extract_area_subsets.cc
+++ b/src/accessor/grib_accessor_class_bufr_extract_area_subsets.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,117 +10,14 @@
  */
 
 #include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = init; get_native_type
-   IMPLEMENTS = pack_long;
-   MEMBERS    = const char* doExtractSubsets
-   MEMBERS    = const char* numberOfSubsets
-   MEMBERS    = const char* extractSubsetList
-   MEMBERS    = const char* extractAreaWestLongitude
-   MEMBERS    = const char* extractAreaEastLongitude
-   MEMBERS    = const char* extractAreaNorthLatitude
-   MEMBERS    = const char* extractAreaSouthLatitude
-   MEMBERS    = const char* extractAreaLongitudeRank
-   MEMBERS    = const char* extractAreaLatitudeRank
-   MEMBERS    = const char* extractedAreaNumberOfSubsets
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_bufr_extract_area_subsets
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in bufr_extract_area_subsets */
-    const char* doExtractSubsets;
-    const char* numberOfSubsets;
-    const char* extractSubsetList;
-    const char* extractAreaWestLongitude;
-    const char* extractAreaEastLongitude;
-    const char* extractAreaNorthLatitude;
-    const char* extractAreaSouthLatitude;
-    const char* extractAreaLongitudeRank;
-    const char* extractAreaLatitudeRank;
-    const char* extractedAreaNumberOfSubsets;
-} grib_accessor_bufr_extract_area_subsets;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_bufr_extract_area_subsets = {
-    &grib_accessor_class_gen,                      /* super */
-    "bufr_extract_area_subsets",                      /* name */
-    sizeof(grib_accessor_bufr_extract_area_subsets),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_bufr_extract_area_subsets.h"
 
+grib_accessor_class_bufr_extract_area_subsets_t _grib_accessor_class_bufr_extract_area_subsets{"bufr_extract_area_subsets"};
 grib_accessor_class* grib_accessor_class_bufr_extract_area_subsets = &_grib_accessor_class_bufr_extract_area_subsets;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    grib_accessor_bufr_extract_area_subsets* self = (grib_accessor_bufr_extract_area_subsets*)a;
+void grib_accessor_class_bufr_extract_area_subsets_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    grib_accessor_bufr_extract_area_subsets_t* self = (grib_accessor_bufr_extract_area_subsets_t*)a;
     grib_handle* h = grib_handle_of_accessor(a);
     int n = 0;
 
@@ -138,22 +36,19 @@ static void init(grib_accessor* a, const long len, grib_arguments* arg)
     a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
 }
 
-static int get_native_type(grib_accessor* a)
-{
+int grib_accessor_class_bufr_extract_area_subsets_t::get_native_type(grib_accessor* a){
     return GRIB_TYPE_LONG;
 }
 
 /* Copy first element of array into all others */
-static void fill_in(double a[], long length)
-{
+void fill_in(double a[], long length){
     long i;
     for (i = 1; i < length; ++i)
         a[i] = a[0];
 }
 
-static int select_area(grib_accessor* a)
-{
-    grib_accessor_bufr_extract_area_subsets* self = (grib_accessor_bufr_extract_area_subsets*)a;
+int select_area(grib_accessor* a){
+    grib_accessor_bufr_extract_area_subsets_t* self = (grib_accessor_bufr_extract_area_subsets_t*)a;
 
     int ret = 0;
     long compressed = 0;
@@ -281,9 +176,8 @@ static int select_area(grib_accessor* a)
     return ret;
 }
 
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    /*grib_accessor_bufr_extract_area_subsets *self =(grib_accessor_bufr_extract_area_subsets*)a;*/
+int grib_accessor_class_bufr_extract_area_subsets_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    /*grib_accessor_bufr_extract_area_subsets_t *self =(grib_accessor_bufr_extract_area_subsets_t*)a;*/
 
     if (*len == 0)
         return GRIB_SUCCESS;
diff --git a/src/accessor/grib_accessor_class_bufr_extract_area_subsets.h b/src/accessor/grib_accessor_class_bufr_extract_area_subsets.h
new file mode 100644
index 000000000..d079f958e
--- /dev/null
+++ b/src/accessor/grib_accessor_class_bufr_extract_area_subsets.h
@@ -0,0 +1,43 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_bufr_extract_area_subsets_h
+#define eccodes_accessor_bufr_extract_area_subsets_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_bufr_extract_area_subsets_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in bufr_extract_area_subsets */
+    const char* doExtractSubsets;
+    const char* numberOfSubsets;
+    const char* extractSubsetList;
+    const char* extractAreaWestLongitude;
+    const char* extractAreaEastLongitude;
+    const char* extractAreaNorthLatitude;
+    const char* extractAreaSouthLatitude;
+    const char* extractAreaLongitudeRank;
+    const char* extractAreaLatitudeRank;
+    const char* extractedAreaNumberOfSubsets;
+};
+
+class grib_accessor_class_bufr_extract_area_subsets_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_bufr_extract_area_subsets_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_bufr_extract_area_subsets_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_bufr_extract_area_subsets_h */
diff --git a/src/accessor/todo/grib_accessor_class_bufr_extract_datetime_subsets.cc b/src/accessor/grib_accessor_class_bufr_extract_datetime_subsets.cc
similarity index 76%
rename from src/accessor/todo/grib_accessor_class_bufr_extract_datetime_subsets.cc
rename to src/accessor/grib_accessor_class_bufr_extract_datetime_subsets.cc
index d5ec98bf6..0568f02dc 100644
--- a/src/accessor/todo/grib_accessor_class_bufr_extract_datetime_subsets.cc
+++ b/src/accessor/grib_accessor_class_bufr_extract_datetime_subsets.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,104 +10,15 @@
  */
 
 #include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = init; get_native_type
-   IMPLEMENTS = pack_long;
-   MEMBERS    = const char* doExtractSubsets
-   MEMBERS    = const char* numberOfSubsets
-   MEMBERS    = const char* extractSubsetList
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_bufr_extract_datetime_subsets
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in bufr_extract_datetime_subsets */
-    const char* doExtractSubsets;
-    const char* numberOfSubsets;
-    const char* extractSubsetList;
-} grib_accessor_bufr_extract_datetime_subsets;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_bufr_extract_datetime_subsets = {
-    &grib_accessor_class_gen,                      /* super */
-    "bufr_extract_datetime_subsets",                      /* name */
-    sizeof(grib_accessor_bufr_extract_datetime_subsets),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_bufr_extract_datetime_subsets.h"
 
+grib_accessor_class_bufr_extract_datetime_subsets_t _grib_accessor_class_bufr_extract_datetime_subsets{"bufr_extract_datetime_subsets"};
 grib_accessor_class* grib_accessor_class_bufr_extract_datetime_subsets = &_grib_accessor_class_bufr_extract_datetime_subsets;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
+void grib_accessor_class_bufr_extract_datetime_subsets_t::init(grib_accessor* a, const long len, grib_arguments* arg){
     int n                                             = 0;
-    grib_accessor_bufr_extract_datetime_subsets* self = (grib_accessor_bufr_extract_datetime_subsets*)a;
+    grib_accessor_bufr_extract_datetime_subsets_t* self = (grib_accessor_bufr_extract_datetime_subsets_t*)a;
 
     a->length               = 0;
     self->doExtractSubsets  = grib_arguments_get_name(grib_handle_of_accessor(a), arg, n++);
@@ -116,14 +28,12 @@ static void init(grib_accessor* a, const long len, grib_arguments* arg)
     a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
 }
 
-static int get_native_type(grib_accessor* a)
-{
+int grib_accessor_class_bufr_extract_datetime_subsets_t::get_native_type(grib_accessor* a){
     return GRIB_TYPE_LONG;
 }
 
 /* Convert input date to Julian number. If date is invalid, return -1 */
-static double date_to_julian(long year, long month, long day, long hour, long minute, double second)
-{
+double date_to_julian(long year, long month, long day, long hour, long minute, double second){
     double result = 0; /* Julian number in units of days */
 
     /* For validating the date/time, we specify seconds as an integer */
@@ -194,11 +104,10 @@ static int build_long_array(grib_context* c, grib_handle* h, int compressed,
     return err;
 }
 
-static int select_datetime(grib_accessor* a)
-{
+int select_datetime(grib_accessor* a){
     int ret                                           = 0;
     long compressed                                   = 0;
-    grib_accessor_bufr_extract_datetime_subsets* self = (grib_accessor_bufr_extract_datetime_subsets*)a;
+    grib_accessor_bufr_extract_datetime_subsets_t* self = (grib_accessor_bufr_extract_datetime_subsets_t*)a;
     grib_handle* h                                    = grib_handle_of_accessor(a);
     grib_context* c                                   = h->context;
     size_t n;
@@ -423,9 +332,8 @@ cleanup:
     return ret;
 }
 
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    /*grib_accessor_bufr_extract_datetime_subsets *self =(grib_accessor_bufr_extract_datetime_subsets*)a;*/
+int grib_accessor_class_bufr_extract_datetime_subsets_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    /*grib_accessor_bufr_extract_datetime_subsets_t *self =(grib_accessor_bufr_extract_datetime_subsets_t*)a;*/
 
     if (*len == 0)
         return GRIB_SUCCESS;
diff --git a/src/accessor/grib_accessor_class_bufr_extract_datetime_subsets.h b/src/accessor/grib_accessor_class_bufr_extract_datetime_subsets.h
new file mode 100644
index 000000000..7acfd35b3
--- /dev/null
+++ b/src/accessor/grib_accessor_class_bufr_extract_datetime_subsets.h
@@ -0,0 +1,36 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_bufr_extract_datetime_subsets_h
+#define eccodes_accessor_bufr_extract_datetime_subsets_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_bufr_extract_datetime_subsets_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in bufr_extract_datetime_subsets */
+    const char* doExtractSubsets;
+    const char* numberOfSubsets;
+    const char* extractSubsetList;
+};
+
+class grib_accessor_class_bufr_extract_datetime_subsets_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_bufr_extract_datetime_subsets_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_bufr_extract_datetime_subsets_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_bufr_extract_datetime_subsets_h */
diff --git a/src/accessor/grib_accessor_class_bufr_extract_subsets.cc b/src/accessor/grib_accessor_class_bufr_extract_subsets.cc
new file mode 100644
index 000000000..6fbea28a2
--- /dev/null
+++ b/src/accessor/grib_accessor_class_bufr_extract_subsets.cc
@@ -0,0 +1,58 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_bufr_extract_subsets.h"
+
+grib_accessor_class_bufr_extract_subsets_t _grib_accessor_class_bufr_extract_subsets{"bufr_extract_subsets"};
+grib_accessor_class* grib_accessor_class_bufr_extract_subsets = &_grib_accessor_class_bufr_extract_subsets;
+
+
+void get_accessors(grib_accessor* a){
+    grib_accessor_bufr_extract_subsets_t* self = (grib_accessor_bufr_extract_subsets_t*)a;
+    const grib_handle* h = grib_handle_of_accessor(a);
+
+    if (self->packAccessor)
+        return;
+    self->numericValuesAccessor = grib_find_accessor(h, self->numericValues);
+    self->packAccessor          = grib_find_accessor(h, self->pack);
+}
+
+void grib_accessor_class_bufr_extract_subsets_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    int n = 0;
+    grib_accessor_bufr_extract_subsets_t* self = (grib_accessor_bufr_extract_subsets_t*)a;
+
+    a->length           = 0;
+    self->numericValues = grib_arguments_get_name(grib_handle_of_accessor(a), arg, n++);
+    self->pack          = grib_arguments_get_name(grib_handle_of_accessor(a), arg, n++);
+    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
+}
+
+int grib_accessor_class_bufr_extract_subsets_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_LONG;
+}
+
+int grib_accessor_class_bufr_extract_subsets_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_bufr_extract_subsets_t* self = (grib_accessor_bufr_extract_subsets_t*)a;
+    size_t l = 1;
+    long v[1];
+
+    get_accessors(a);
+
+    v[0] = 1;
+    int err  = self->packAccessor->pack_long(v, &l);    if (err) {
+        if (err == GRIB_ENCODING_ERROR)
+            grib_context_log(a->context, GRIB_LOG_ERROR, "Could not extract subset(s).\n\tHint: Did you forget to set unpack=1?");
+        return err;
+    }
+
+    return err;
+}
diff --git a/src/accessor/grib_accessor_class_bufr_extract_subsets.h b/src/accessor/grib_accessor_class_bufr_extract_subsets.h
new file mode 100644
index 000000000..80392338d
--- /dev/null
+++ b/src/accessor/grib_accessor_class_bufr_extract_subsets.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_bufr_extract_subsets_h
+#define eccodes_accessor_bufr_extract_subsets_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_bufr_extract_subsets_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in bufr_extract_subsets */
+    const char* numericValues;
+    const char* pack;
+    grib_accessor* numericValuesAccessor;
+    grib_accessor* packAccessor;
+};
+
+class grib_accessor_class_bufr_extract_subsets_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_bufr_extract_subsets_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_bufr_extract_subsets_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_bufr_extract_subsets_h */
diff --git a/src/accessor/grib_accessor_class_bufr_group.cc b/src/accessor/grib_accessor_class_bufr_group.cc
new file mode 100644
index 000000000..73075fcf1
--- /dev/null
+++ b/src/accessor/grib_accessor_class_bufr_group.cc
@@ -0,0 +1,39 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_bufr_group.h"
+
+grib_accessor_class_bufr_group_t _grib_accessor_class_bufr_group{"bufr_group"};
+grib_accessor_class* grib_accessor_class_bufr_group = &_grib_accessor_class_bufr_group;
+
+
+void grib_accessor_class_bufr_group_t::dump(grib_accessor* a, grib_dumper* dumper){
+    grib_dump_section(dumper, a, a->sub_section->block);
+}
+
+static grib_accessor* next(grib_accessor* a, int explore)
+{
+    grib_accessor* next = NULL;
+    if (explore) {
+        next = a->sub_section->block->first;
+        if (!next)
+            next = a->next;
+    }
+    else {
+        next = a->next;
+    }
+    if (!next) {
+        if (a->parent->owner)
+            next = a->parent->owner->cclass->next(a->parent->owner, 0);
+    }
+    return next;
+}
diff --git a/src/accessor/grib_accessor_class_bufr_group.h b/src/accessor/grib_accessor_class_bufr_group.h
new file mode 100644
index 000000000..84a202583
--- /dev/null
+++ b/src/accessor/grib_accessor_class_bufr_group.h
@@ -0,0 +1,31 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_bufr_group_h
+#define eccodes_accessor_bufr_group_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_variable.h"
+
+class grib_accessor_bufr_group_t : public grib_accessor_variable_t
+{
+public:
+    /* Members defined in bufr_group */
+};
+
+class grib_accessor_class_bufr_group_t : public grib_accessor_class_variable_t
+{
+public:
+    grib_accessor_class_bufr_group_t(const char* name) : grib_accessor_class_variable_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_bufr_group_t{}; }
+    void dump(grib_accessor*, grib_dumper*) override;
+};
+#endif /* eccodes_accessor_bufr_group_h */
diff --git a/src/accessor/grib_accessor_class_bufr_simple_thinning.cc b/src/accessor/grib_accessor_class_bufr_simple_thinning.cc
new file mode 100644
index 000000000..1743104fd
--- /dev/null
+++ b/src/accessor/grib_accessor_class_bufr_simple_thinning.cc
@@ -0,0 +1,114 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_bufr_simple_thinning.h"
+
+grib_accessor_class_bufr_simple_thinning_t _grib_accessor_class_bufr_simple_thinning{"bufr_simple_thinning"};
+grib_accessor_class* grib_accessor_class_bufr_simple_thinning = &_grib_accessor_class_bufr_simple_thinning;
+
+
+void grib_accessor_class_bufr_simple_thinning_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    grib_accessor_bufr_simple_thinning_t* self = (grib_accessor_bufr_simple_thinning_t*)a;
+    grib_handle* h = grib_handle_of_accessor(a);
+    int n = 0;
+
+    a->length                         = 0;
+    self->doExtractSubsets            = grib_arguments_get_name(h, arg, n++);
+    self->numberOfSubsets             = grib_arguments_get_name(h, arg, n++);
+    self->extractSubsetList           = grib_arguments_get_name(h, arg, n++);
+    self->simpleThinningStart         = grib_arguments_get_name(h, arg, n++);
+    self->simpleThinningMissingRadius = grib_arguments_get_name(h, arg, n++);
+    self->simpleThinningSkip          = grib_arguments_get_name(h, arg, n++);
+
+    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
+}
+
+int grib_accessor_class_bufr_simple_thinning_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_LONG;
+}
+
+int apply_thinning(grib_accessor* a){
+    const grib_accessor_bufr_simple_thinning_t* self = (grib_accessor_bufr_simple_thinning_t*)a;
+
+    long skip;
+    grib_handle* h  = grib_handle_of_accessor(a);
+    grib_context* c = h->context;
+    long compressed = 0, nsubsets;
+    grib_iarray* subsets;
+    long* subsets_ar = 0;
+    long start = 0, radius = 0;
+
+    int ret = grib_get_long(h, "compressedData", &compressed);
+    if (ret)
+        return ret;
+    if (compressed) {
+        long numberOfSubsets = 0;
+        ret                  = grib_get_long(h, self->numberOfSubsets, &numberOfSubsets);
+        if (ret)
+            return ret;
+
+        ret = grib_get_long(h, self->simpleThinningStart, &start);
+        if (ret)
+            return ret;
+
+        ret = grib_get_long(h, self->simpleThinningSkip, &skip);
+        if (ret)
+            return ret;
+        if (skip <= 0)
+            return GRIB_INVALID_KEY_VALUE;
+
+        ret = grib_get_long(h, self->simpleThinningMissingRadius, &radius);
+        if (ret)
+            return ret;
+
+        subsets = grib_iarray_new(c, numberOfSubsets / skip + 1, 10);
+        for (long i = 0; i < numberOfSubsets; i += skip + 1) {
+            grib_iarray_push(subsets, i + 1);
+        }
+
+        nsubsets = grib_iarray_used_size(subsets);
+
+        if (nsubsets != 0) {
+            subsets_ar = grib_iarray_get_array(subsets);
+            ret        = grib_set_long_array(h, self->extractSubsetList, subsets_ar, nsubsets);
+            grib_context_free(c, subsets_ar);
+            if (ret)
+                return ret;
+
+            ret = grib_set_long(h, "unpack", 1);
+            if (ret)
+                return ret;
+
+            ret = grib_set_long(h, self->doExtractSubsets, 1);
+            if (ret)
+                return ret;
+        }
+        grib_iarray_delete(subsets);
+    }
+    else {
+        return GRIB_NOT_IMPLEMENTED;
+    }
+
+    return ret;
+}
+
+int grib_accessor_class_bufr_simple_thinning_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    const grib_accessor_bufr_simple_thinning_t* self = (grib_accessor_bufr_simple_thinning_t*)a;
+
+    if (*len == 0)
+        return GRIB_SUCCESS;
+    int err = apply_thinning(a);
+    if (err)
+        return err;
+
+    return grib_set_long(a->parent->h, self->doExtractSubsets, 1);
+}
diff --git a/src/accessor/grib_accessor_class_bufr_simple_thinning.h b/src/accessor/grib_accessor_class_bufr_simple_thinning.h
new file mode 100644
index 000000000..eb786f966
--- /dev/null
+++ b/src/accessor/grib_accessor_class_bufr_simple_thinning.h
@@ -0,0 +1,39 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_bufr_simple_thinning_h
+#define eccodes_accessor_bufr_simple_thinning_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_bufr_simple_thinning_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in bufr_simple_thinning */
+    const char* doExtractSubsets;
+    const char* numberOfSubsets;
+    const char* extractSubsetList;
+    const char* simpleThinningStart;
+    const char* simpleThinningMissingRadius;
+    const char* simpleThinningSkip;
+};
+
+class grib_accessor_class_bufr_simple_thinning_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_bufr_simple_thinning_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_bufr_simple_thinning_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_bufr_simple_thinning_h */
diff --git a/src/accessor/grib_accessor_class_bufr_string_values.cc b/src/accessor/grib_accessor_class_bufr_string_values.cc
new file mode 100644
index 000000000..2568021a4
--- /dev/null
+++ b/src/accessor/grib_accessor_class_bufr_string_values.cc
@@ -0,0 +1,84 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_bufr_string_values.h"
+#include "grib_accessor_class_bufr_data_array.h"
+
+grib_accessor_class_bufr_string_values_t _grib_accessor_class_bufr_string_values{"bufr_string_values"};
+grib_accessor_class* grib_accessor_class_bufr_string_values = &_grib_accessor_class_bufr_string_values;
+
+
+void grib_accessor_class_bufr_string_values_t::init(grib_accessor* a, const long len, grib_arguments* args){
+    grib_accessor_bufr_string_values_t* self = (grib_accessor_bufr_string_values_t*)a;
+    int n                                  = 0;
+    self->dataAccessorName                 = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
+    self->dataAccessor                     = NULL;
+    a->length                              = 0;
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+}
+
+void grib_accessor_class_bufr_string_values_t::dump(grib_accessor* a, grib_dumper* dumper){
+    grib_dump_string_array(dumper, a, NULL);
+}
+
+static grib_accessor* get_accessor(grib_accessor* a)
+{
+    grib_accessor_bufr_string_values_t* self = (grib_accessor_bufr_string_values_t*)a;
+    if (!self->dataAccessor) {
+        self->dataAccessor = grib_find_accessor(grib_handle_of_accessor(a), self->dataAccessorName);
+    }
+    return self->dataAccessor;
+}
+
+int grib_accessor_class_bufr_string_values_t::unpack_string_array(grib_accessor* a, char** buffer, size_t* len){
+    grib_accessor* data        = 0;
+    grib_context* c            = a->context;
+    grib_vsarray* stringValues = NULL;
+    size_t l = 0, tl;
+    size_t i, j, n = 0;
+    char** b = buffer;
+
+    data = get_accessor(a);
+    if (!data)
+        return GRIB_NOT_FOUND;
+
+    stringValues = accessor_bufr_data_array_get_stringValues(data);
+
+    n = grib_vsarray_used_size(stringValues);
+
+    tl = 0;
+    for (j = 0; j < n; j++) {
+        l = grib_sarray_used_size(stringValues->v[j]);
+        tl += l;
+
+        if (tl > *len)
+            return GRIB_ARRAY_TOO_SMALL;
+
+        for (i = 0; i < l; i++) {
+            *(b++) = grib_context_strdup(c, stringValues->v[j]->v[i]);
+        }
+    }
+    *len = tl;
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_bufr_string_values_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    return GRIB_NOT_IMPLEMENTED;
+}
+
+int grib_accessor_class_bufr_string_values_t::value_count(grib_accessor* a, long* rlen){
+    grib_accessor* descriptors = get_accessor(a);
+    return descriptors->value_count(rlen);}
+
+void grib_accessor_class_bufr_string_values_t::destroy(grib_context* c, grib_accessor* a){
+}
diff --git a/src/accessor/grib_accessor_class_bufr_string_values.h b/src/accessor/grib_accessor_class_bufr_string_values.h
new file mode 100644
index 000000000..9038a8d73
--- /dev/null
+++ b/src/accessor/grib_accessor_class_bufr_string_values.h
@@ -0,0 +1,38 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_bufr_string_values_h
+#define eccodes_accessor_bufr_string_values_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_ascii.h"
+
+class grib_accessor_bufr_string_values_t : public grib_accessor_ascii_t
+{
+public:
+    /* Members defined in bufr_string_values */
+    const char* dataAccessorName;
+    grib_accessor* dataAccessor;
+};
+
+class grib_accessor_class_bufr_string_values_t : public grib_accessor_class_ascii_t
+{
+public:
+    grib_accessor_class_bufr_string_values_t(const char* name) : grib_accessor_class_ascii_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_bufr_string_values_t{}; }
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    int unpack_string_array(grib_accessor*, char**, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void destroy(grib_context*, grib_accessor*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_bufr_string_values_h */
diff --git a/src/accessor/grib_accessor_class_bufrdc_expanded_descriptors.cc b/src/accessor/grib_accessor_class_bufrdc_expanded_descriptors.cc
new file mode 100644
index 000000000..2f4073460
--- /dev/null
+++ b/src/accessor/grib_accessor_class_bufrdc_expanded_descriptors.cc
@@ -0,0 +1,98 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_bufrdc_expanded_descriptors.h"
+
+grib_accessor_class_bufrdc_expanded_descriptors_t _grib_accessor_class_bufrdc_expanded_descriptors{"bufrdc_expanded_descriptors"};
+grib_accessor_class* grib_accessor_class_bufrdc_expanded_descriptors = &_grib_accessor_class_bufrdc_expanded_descriptors;
+
+
+void grib_accessor_class_bufrdc_expanded_descriptors_t::init(grib_accessor* a, const long len, grib_arguments* args){
+    grib_accessor_bufrdc_expanded_descriptors_t* self = (grib_accessor_bufrdc_expanded_descriptors_t*)a;
+    int n                                           = 0;
+    self->expandedDescriptors                       = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
+    self->expandedDescriptorsAccessor               = 0;
+    a->length                                       = 0;
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+}
+
+static grib_accessor* get_accessor(grib_accessor* a)
+{
+    grib_accessor_bufrdc_expanded_descriptors_t* self = (grib_accessor_bufrdc_expanded_descriptors_t*)a;
+    if (!self->expandedDescriptorsAccessor) {
+        self->expandedDescriptorsAccessor = grib_find_accessor(grib_handle_of_accessor(a), self->expandedDescriptors);
+    }
+    return self->expandedDescriptorsAccessor;
+}
+
+int grib_accessor_class_bufrdc_expanded_descriptors_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor* descriptors = 0;
+    size_t rlen  = 0, l;
+    long lenall  = 0;
+    size_t i     = 0;
+    long* v      = 0;
+    grib_context* c = a->context;
+
+    descriptors = get_accessor(a);
+    if (!descriptors) return GRIB_NOT_FOUND;
+
+    a->value_count(&lenall);    v = (long*)grib_context_malloc_clear(c, sizeof(long) * lenall);
+    l = lenall;
+    descriptors->unpack_long(v, &l);
+    rlen = 0;
+    for (i = 0; i < l; i++) {
+        if ((v[i] < 100000 || v[i] > 221999))
+            val[rlen++] = v[i];
+    }
+    *len = rlen;
+    grib_context_free(c,v);
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_bufrdc_expanded_descriptors_t::unpack_string_array(grib_accessor* a, char** buffer, size_t* len){
+    int err = 0;
+    grib_accessor* descriptors = 0;
+    size_t l     = 0;
+    long lenall  = 0;
+    size_t i     = 0;
+    long* v      = 0;
+    char buf[25] = {0,};
+    grib_context* c = a->context;
+
+    descriptors = get_accessor(a);
+    if (!descriptors) return GRIB_NOT_FOUND;
+
+    err = a->value_count(&lenall);    if (err) return err;
+    l = lenall;
+    if (l > *len) return GRIB_ARRAY_TOO_SMALL;
+
+    v = (long*)grib_context_malloc_clear(c, sizeof(long) * l);
+    err = descriptors->unpack_long(v, &l);    if (err) return err;
+
+    for (i = 0; i < l; i++) {
+        snprintf(buf, sizeof(buf), "%06ld", v[i]);
+        buffer[i] = grib_context_strdup(c, buf);
+    }
+    *len = l;
+    grib_context_free(c,v);
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_bufrdc_expanded_descriptors_t::value_count(grib_accessor* a, long* rlen){
+    grib_accessor* descriptors = get_accessor(a);
+
+    return descriptors->value_count(rlen);}
+
+void grib_accessor_class_bufrdc_expanded_descriptors_t::destroy(grib_context* c, grib_accessor* a){
+}
diff --git a/src/accessor/grib_accessor_class_bufrdc_expanded_descriptors.h b/src/accessor/grib_accessor_class_bufrdc_expanded_descriptors.h
new file mode 100644
index 000000000..588f9d08b
--- /dev/null
+++ b/src/accessor/grib_accessor_class_bufrdc_expanded_descriptors.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_bufrdc_expanded_descriptors_h
+#define eccodes_accessor_bufrdc_expanded_descriptors_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_bufrdc_expanded_descriptors_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in bufrdc_expanded_descriptors */
+    const char* expandedDescriptors;
+    grib_accessor* expandedDescriptorsAccessor;
+};
+
+class grib_accessor_class_bufrdc_expanded_descriptors_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_bufrdc_expanded_descriptors_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_bufrdc_expanded_descriptors_t{}; }
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string_array(grib_accessor*, char**, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void destroy(grib_context*, grib_accessor*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_bufrdc_expanded_descriptors_h */
diff --git a/src/accessor/grib_accessor_class_bytes.cc b/src/accessor/grib_accessor_class_bytes.cc
new file mode 100644
index 000000000..e0002429a
--- /dev/null
+++ b/src/accessor/grib_accessor_class_bytes.cc
@@ -0,0 +1,99 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_bytes.h"
+
+grib_accessor_class_bytes_t _grib_accessor_class_bytes{"bytes"};
+grib_accessor_class* grib_accessor_class_bytes = &_grib_accessor_class_bytes;
+
+
+void grib_accessor_class_bytes_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    /*grib_accessor_signed* self = (grib_accessor_signed*)a;  */
+    a->length = len;
+    Assert(a->length >= 0);
+}
+
+int grib_accessor_class_bytes_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_BYTES;
+}
+
+int grib_accessor_class_bytes_t::compare(grib_accessor* a, grib_accessor* b){
+    int retval = GRIB_SUCCESS;
+
+    size_t alen = (size_t)a->byte_count();    size_t blen = (size_t)b->byte_count();
+    if (alen != blen)
+        return GRIB_COUNT_MISMATCH;
+
+    return retval;
+}
+
+int grib_accessor_class_bytes_t::unpack_string(grib_accessor* a, char* v, size_t* len){
+    unsigned char* p = NULL;
+    char* s          = v;
+    long i = 0;
+    const long length = a->byte_count();    const long slength = 2 * length;
+
+    if (*len < (size_t)slength) {
+        *len = slength;
+        return GRIB_BUFFER_TOO_SMALL;
+    }
+
+    p = grib_handle_of_accessor(a)->buffer->data + a->byte_offset();
+    for (i = 0; i < length; i++) {
+        snprintf(s, INT_MAX, "%02x", *(p++));
+        s += 2;
+    }
+
+    *len = slength;
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_bytes_t::pack_string(grib_accessor* a, const char* val, size_t* len){
+    /* The string representation (val) of the byte array will have two chars
+     * per byte e.g. 4C5B means the 2 bytes 0114 and 0133 in octal
+     * so has to be twice the length of the byte array
+     */
+    int err = 0;
+    grib_context* c = a->context;
+    size_t nbytes = a->length;
+    const size_t expected_blen = nbytes;
+    const size_t expected_slen = 2 * expected_blen;
+    unsigned char* bytearray = NULL;
+    size_t i = 0, slen = strlen(val);
+
+    if (slen != expected_slen || *len != expected_slen) {
+        grib_context_log(c, GRIB_LOG_ERROR,
+                        "%s: Key %s is %lu bytes. Expected a string with %lu characters (actual length=%zu)",
+                        __func__, a->name, expected_blen, expected_slen, *len);
+        return GRIB_WRONG_ARRAY_SIZE;
+    }
+
+    bytearray = (unsigned char*)grib_context_malloc(c, nbytes * (sizeof(unsigned char)));
+    if (!bytearray) return GRIB_OUT_OF_MEMORY;
+
+    for (i = 0; i < (slen/2); i++) {
+        unsigned int byteVal = 0;
+        if (sscanf(val + 2*i, "%02x", &byteVal) != 1) {
+            grib_context_log(c, GRIB_LOG_ERROR,"%s: Invalid hex byte specfication '%.2s'", __func__, val + 2*i);
+            grib_context_free(c, bytearray);
+            return GRIB_INVALID_KEY_VALUE;
+        }
+        Assert(byteVal < 256);
+        bytearray[i] = (int)byteVal;
+    }
+
+    /* Forward to base class to pack the byte array */
+    err = grib_accessor_class_gen_t::pack_bytes(a, bytearray, &nbytes);
+    grib_context_free(c, bytearray);
+    return err;
+}
diff --git a/src/accessor/grib_accessor_class_bytes.h b/src/accessor/grib_accessor_class_bytes.h
new file mode 100644
index 000000000..8204ceba7
--- /dev/null
+++ b/src/accessor/grib_accessor_class_bytes.h
@@ -0,0 +1,35 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_bytes_h
+#define eccodes_accessor_bytes_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_bytes_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in bytes */
+};
+
+class grib_accessor_class_bytes_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_bytes_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_bytes_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_string(grib_accessor*, const char*, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    int compare(grib_accessor*, grib_accessor*) override;
+};
+#endif /* eccodes_accessor_bytes_h */
diff --git a/src/accessor/grib_accessor_class_change_alternative_row_scanning.cc b/src/accessor/grib_accessor_class_change_alternative_row_scanning.cc
new file mode 100644
index 000000000..8375ee26d
--- /dev/null
+++ b/src/accessor/grib_accessor_class_change_alternative_row_scanning.cc
@@ -0,0 +1,117 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_change_alternative_row_scanning.h"
+
+grib_accessor_class_change_alternative_row_scanning_t _grib_accessor_class_change_alternative_row_scanning{"change_alternative_row_scanning"};
+grib_accessor_class* grib_accessor_class_change_alternative_row_scanning = &_grib_accessor_class_change_alternative_row_scanning;
+
+
+void grib_accessor_class_change_alternative_row_scanning_t::init(grib_accessor* a, const long len, grib_arguments* args){
+    int n                                               = 0;
+    grib_accessor_change_alternative_row_scanning_t* self = (grib_accessor_change_alternative_row_scanning_t*)a;
+
+    self->values                 = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
+    self->Ni                     = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
+    self->Nj                     = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
+    self->alternativeRowScanning = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
+
+    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
+    a->length = 0;
+}
+
+int grib_accessor_class_change_alternative_row_scanning_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    int err = 0;
+    grib_accessor_change_alternative_row_scanning_t* self = (grib_accessor_change_alternative_row_scanning_t*)a;
+    const grib_context* c = a->context;
+    grib_handle* h  = grib_handle_of_accessor(a);
+    long i, j, jr, theEnd, Ni, Nj, k, kp, alternativeRowScanning;
+    size_t size = 0;
+    double* values = NULL;
+    double tmp = 0.0;
+
+    if (*val == 0)
+        return 0;
+
+    /* Make sure Ni / Nj are not missing */
+    if (grib_is_missing(h, self->Ni, &err) && !err) {
+        grib_context_log(c, GRIB_LOG_ERROR, "change_alternative_row_scanning: Key %s cannot be 'missing'!", self->Ni);
+        return GRIB_WRONG_GRID;
+    }
+    if (grib_is_missing(h, self->Nj, &err) && !err) {
+        grib_context_log(c, GRIB_LOG_ERROR, "change_alternative_row_scanning: Key %s cannot be 'missing'!", self->Nj);
+        return GRIB_WRONG_GRID;
+    }
+
+    if ((err = grib_get_long_internal(h, self->Ni, &Ni)) != GRIB_SUCCESS)
+        return err;
+    if ((err = grib_get_long_internal(h, self->Nj, &Nj)) != GRIB_SUCCESS)
+        return err;
+    if ((err = grib_get_long_internal(h, self->alternativeRowScanning, &alternativeRowScanning)) != GRIB_SUCCESS)
+        return err;
+
+    if ((err = grib_get_size(h, self->values, &size)) != GRIB_SUCCESS)
+        return err;
+
+    if ( size > (size_t)(Ni * Nj) ) {
+        grib_context_log(c, GRIB_LOG_ERROR, "change_alternative_row_scanning: wrong values size!=Ni*Nj (%zu!=%ld*%ld)", size, Ni, Nj);
+        return GRIB_WRONG_ARRAY_SIZE;
+    }
+
+    values = (double*)grib_context_malloc(c, size * sizeof(double));
+    if (!values)
+        return GRIB_OUT_OF_MEMORY;
+
+    if ((err = grib_get_double_array_internal(h, self->values, values, &size)) != GRIB_SUCCESS) {
+        grib_context_free(c, values);
+        return err;
+    }
+
+    theEnd = Ni / 2;
+    for (j = 0; j < Nj; j++) {
+        jr = Ni * j;
+        for (i = 0; i < theEnd; i++) {
+            if (j % 2 == 1) {
+                /* Swap first and last value on every odd row */
+                k          = jr + i;
+                kp         = jr + Ni - i - 1;
+                tmp        = values[k];
+                values[k]  = values[kp];
+                values[kp] = tmp;
+            }
+        }
+    }
+    alternativeRowScanning = !alternativeRowScanning;
+    if ((err = grib_set_long_internal(h, self->alternativeRowScanning, alternativeRowScanning)) != GRIB_SUCCESS) {
+        grib_context_free(c, values);
+        return err;
+    }
+
+    if ((err = grib_set_double_array_internal(h, self->values, values, size)) != GRIB_SUCCESS) {
+        grib_context_free(c, values);
+        return err;
+    }
+
+    grib_context_free(c, values);
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_change_alternative_row_scanning_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_LONG;
+}
+
+int grib_accessor_class_change_alternative_row_scanning_t::unpack_long(grib_accessor* a, long* v, size_t* len){
+    /* Decoding this accessor doesn't make sense so we return a dummy value */
+    *v = -1;
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_change_alternative_row_scanning.h b/src/accessor/grib_accessor_class_change_alternative_row_scanning.h
new file mode 100644
index 000000000..c893e242f
--- /dev/null
+++ b/src/accessor/grib_accessor_class_change_alternative_row_scanning.h
@@ -0,0 +1,38 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_change_alternative_row_scanning_h
+#define eccodes_accessor_change_alternative_row_scanning_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_change_alternative_row_scanning_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in change_alternative_row_scanning */
+    const char* values;
+    const char* Ni;
+    const char* Nj;
+    const char* alternativeRowScanning;
+};
+
+class grib_accessor_class_change_alternative_row_scanning_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_change_alternative_row_scanning_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_change_alternative_row_scanning_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_change_alternative_row_scanning_h */
diff --git a/src/accessor/todo/grib_accessor_class_change_scanning_direction.cc b/src/accessor/grib_accessor_class_change_scanning_direction.cc
similarity index 57%
rename from src/accessor/todo/grib_accessor_class_change_scanning_direction.cc
rename to src/accessor/grib_accessor_class_change_scanning_direction.cc
index f951c9083..b8f71f14c 100644
--- a/src/accessor/todo/grib_accessor_class_change_scanning_direction.cc
+++ b/src/accessor/grib_accessor_class_change_scanning_direction.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,115 +10,14 @@
  */
 
 #include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = pack_long;
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = init;get_native_type
-   MEMBERS = const char* values
-   MEMBERS = const char* Ni
-   MEMBERS = const char* Nj
-   MEMBERS = const char* i_scans_negatively
-   MEMBERS = const char* j_scans_positively
-   MEMBERS = const char* first
-   MEMBERS = const char* last
-   MEMBERS = const char* axis
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_change_scanning_direction
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in change_scanning_direction */
-    const char* values;
-    const char* Ni;
-    const char* Nj;
-    const char* i_scans_negatively;
-    const char* j_scans_positively;
-    const char* first;
-    const char* last;
-    const char* axis;
-} grib_accessor_change_scanning_direction;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_change_scanning_direction = {
-    &grib_accessor_class_gen,                      /* super */
-    "change_scanning_direction",                      /* name */
-    sizeof(grib_accessor_change_scanning_direction),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_change_scanning_direction.h"
 
+grib_accessor_class_change_scanning_direction_t _grib_accessor_class_change_scanning_direction{"change_scanning_direction"};
 grib_accessor_class* grib_accessor_class_change_scanning_direction = &_grib_accessor_class_change_scanning_direction;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long len, grib_arguments* args)
-{
-    grib_accessor_change_scanning_direction* self = (grib_accessor_change_scanning_direction*)a;
+void grib_accessor_class_change_scanning_direction_t::init(grib_accessor* a, const long len, grib_arguments* args){
+    grib_accessor_change_scanning_direction_t* self = (grib_accessor_change_scanning_direction_t*)a;
     grib_handle* h = grib_handle_of_accessor(a);
     int n = 0;
 
@@ -134,8 +34,7 @@ static void init(grib_accessor* a, const long len, grib_arguments* args)
     a->length = 0;
 }
 
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
+int grib_accessor_class_change_scanning_direction_t::pack_long(grib_accessor* a, const long* val, size_t* len){
     int err = 0;
     long i, j, jr, theEnd, Ni, Nj, k, kp;
     double tmp;
@@ -145,7 +44,7 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
     double last                                   = 0;
     size_t size                                   = 0;
     double* values                                = NULL;
-    grib_accessor_change_scanning_direction* self = (grib_accessor_change_scanning_direction*)a;
+    grib_accessor_change_scanning_direction_t* self = (grib_accessor_change_scanning_direction_t*)a;
     const grib_context* c                         = a->context;
     grib_handle* h                                = grib_handle_of_accessor(a);
     const char* cclass_name                       = a->cclass->name;
@@ -248,13 +147,11 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int get_native_type(grib_accessor* a)
-{
+int grib_accessor_class_change_scanning_direction_t::get_native_type(grib_accessor* a){
     return GRIB_TYPE_LONG;
 }
 
-static int unpack_long(grib_accessor* a, long* v, size_t* len)
-{
+int grib_accessor_class_change_scanning_direction_t::unpack_long(grib_accessor* a, long* v, size_t* len){
     /* ECC-976: decoding this accessor doesn't make sense so we return a dummy value */
     *v = -1;
     return GRIB_SUCCESS;
diff --git a/src/accessor/grib_accessor_class_change_scanning_direction.h b/src/accessor/grib_accessor_class_change_scanning_direction.h
new file mode 100644
index 000000000..08f2ceb55
--- /dev/null
+++ b/src/accessor/grib_accessor_class_change_scanning_direction.h
@@ -0,0 +1,42 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_change_scanning_direction_h
+#define eccodes_accessor_change_scanning_direction_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_change_scanning_direction_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in change_scanning_direction */
+    const char* values;
+    const char* Ni;
+    const char* Nj;
+    const char* i_scans_negatively;
+    const char* j_scans_positively;
+    const char* first;
+    const char* last;
+    const char* axis;
+};
+
+class grib_accessor_class_change_scanning_direction_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_change_scanning_direction_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_change_scanning_direction_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_change_scanning_direction_h */
diff --git a/src/accessor/grib_accessor_class_check_internal_version.cc b/src/accessor/grib_accessor_class_check_internal_version.cc
new file mode 100644
index 000000000..65bdbcbf0
--- /dev/null
+++ b/src/accessor/grib_accessor_class_check_internal_version.cc
@@ -0,0 +1,51 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_check_internal_version.h"
+
+grib_accessor_class_check_internal_version_t _grib_accessor_class_check_internal_version{"check_internal_version"};
+grib_accessor_class* grib_accessor_class_check_internal_version = &_grib_accessor_class_check_internal_version;
+
+
+/* This is the internal engine version number */
+/* We check this against the version number found in the definitions boot.def file */
+/* See the key "internalVersion"  */
+#define LATEST_ENGINE_VERSION 30
+
+void grib_accessor_class_check_internal_version_t::init(grib_accessor* a, const long l, grib_arguments* args){
+    /* Check version of definition files is compatible with the engine */
+    int err                    = 0;
+    long defs_file_version     = 0;
+    grib_handle* h             = grib_handle_of_accessor(a);
+    const char* s_defn_version = grib_arguments_get_name(h, args, 0);
+    Assert(s_defn_version);
+
+    err = grib_get_long_internal(h, s_defn_version, &defs_file_version);
+    if (!err) {
+        if (defs_file_version > LATEST_ENGINE_VERSION) {
+            grib_context_log(h->context, GRIB_LOG_FATAL,
+                             "Definition files version (%d) is greater than engine version (%d)!\n"
+                             "                    " /* indent for 2nd line */
+                             "These definition files are for a later version of the ecCodes engine.",
+                             defs_file_version, LATEST_ENGINE_VERSION);
+        }
+    }
+}
+
+int grib_accessor_class_check_internal_version_t::value_count(grib_accessor* a, long* count){
+    *count = 1;
+    return 0;
+}
+
+size_t grib_accessor_class_check_internal_version_t::string_length(grib_accessor* a){
+    return 255;
+}
diff --git a/src/accessor/grib_accessor_class_check_internal_version.h b/src/accessor/grib_accessor_class_check_internal_version.h
new file mode 100644
index 000000000..871f5a56e
--- /dev/null
+++ b/src/accessor/grib_accessor_class_check_internal_version.h
@@ -0,0 +1,33 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_check_internal_version_h
+#define eccodes_accessor_check_internal_version_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_ascii.h"
+
+class grib_accessor_check_internal_version_t : public grib_accessor_ascii_t
+{
+public:
+    /* Members defined in check_internal_version */
+};
+
+class grib_accessor_class_check_internal_version_t : public grib_accessor_class_ascii_t
+{
+public:
+    grib_accessor_class_check_internal_version_t(const char* name) : grib_accessor_class_ascii_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_check_internal_version_t{}; }
+    size_t string_length(grib_accessor*) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_check_internal_version_h */
diff --git a/src/accessor/todo/grib_accessor_class_closest_date.cc b/src/accessor/grib_accessor_class_closest_date.cc
similarity index 57%
rename from src/accessor/todo/grib_accessor_class_closest_date.cc
rename to src/accessor/grib_accessor_class_closest_date.cc
index 08ba9f333..462b90078 100644
--- a/src/accessor/todo/grib_accessor_class_closest_date.cc
+++ b/src/accessor/grib_accessor_class_closest_date.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,121 +10,15 @@
  */
 
 #include "grib_api_internal.h"
+#include "grib_accessor_class_closest_date.h"
 #include <float.h>
 
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_double
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = dump
-   IMPLEMENTS = init
-   MEMBERS    = const char *dateLocal
-   MEMBERS    = const char *timeLocal
-   MEMBERS    = const char *numForecasts
-   MEMBERS    = const char *year
-   MEMBERS    = const char *month
-   MEMBERS    = const char *day
-   MEMBERS    = const char *hour
-   MEMBERS    = const char *minute
-   MEMBERS    = const char *second
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_closest_date
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in closest_date */
-    const char *dateLocal;
-    const char *timeLocal;
-    const char *numForecasts;
-    const char *year;
-    const char *month;
-    const char *day;
-    const char *hour;
-    const char *minute;
-    const char *second;
-} grib_accessor_closest_date;
-
-extern grib_accessor_class* grib_accessor_class_double;
-
-static grib_accessor_class _grib_accessor_class_closest_date = {
-    &grib_accessor_class_double,                      /* super */
-    "closest_date",                      /* name */
-    sizeof(grib_accessor_closest_date),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
+grib_accessor_class_closest_date_t _grib_accessor_class_closest_date{"closest_date"};
 grib_accessor_class* grib_accessor_class_closest_date = &_grib_accessor_class_closest_date;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_closest_date* self = (grib_accessor_closest_date*)a;
+void grib_accessor_class_closest_date_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_closest_date_t* self = (grib_accessor_closest_date_t*)a;
     grib_handle* h = grib_handle_of_accessor(a);
     int n = 0;
 
@@ -140,13 +35,11 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
     a->length = 0;
 }
 
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
+void grib_accessor_class_closest_date_t::dump(grib_accessor* a, grib_dumper* dumper){
     grib_dump_string(dumper, a, NULL);
 }
 
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
+int grib_accessor_class_closest_date_t::unpack_long(grib_accessor* a, long* val, size_t* len){
     int ret  = 0;
     double v = 0;
 
@@ -157,9 +50,8 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
 }
 
 /* Sets val to the 'index' of the closes date */
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    const grib_accessor_closest_date* self = (grib_accessor_closest_date*)a;
+int grib_accessor_class_closest_date_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    const grib_accessor_closest_date_t* self = (grib_accessor_closest_date_t*)a;
 
     int err = 0;
     long num_forecasts = 0; /* numberOfForecastsUsedInLocalTime */
diff --git a/src/accessor/grib_accessor_class_closest_date.h b/src/accessor/grib_accessor_class_closest_date.h
new file mode 100644
index 000000000..b4fbace12
--- /dev/null
+++ b/src/accessor/grib_accessor_class_closest_date.h
@@ -0,0 +1,43 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_closest_date_h
+#define eccodes_accessor_closest_date_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_double.h"
+
+class grib_accessor_closest_date_t : public grib_accessor_double_t
+{
+public:
+    /* Members defined in closest_date */
+    const char *dateLocal;
+    const char *timeLocal;
+    const char *numForecasts;
+    const char *year;
+    const char *month;
+    const char *day;
+    const char *hour;
+    const char *minute;
+    const char *second;
+};
+
+class grib_accessor_class_closest_date_t : public grib_accessor_class_double_t
+{
+public:
+    grib_accessor_class_closest_date_t(const char* name) : grib_accessor_class_double_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_closest_date_t{}; }
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_closest_date_h */
diff --git a/src/accessor/grib_accessor_class_codeflag.cc b/src/accessor/grib_accessor_class_codeflag.cc
new file mode 100644
index 000000000..3baa24c1b
--- /dev/null
+++ b/src/accessor/grib_accessor_class_codeflag.cc
@@ -0,0 +1,119 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_codeflag.h"
+
+grib_accessor_class_codeflag_t _grib_accessor_class_codeflag{"codeflag"};
+grib_accessor_class* grib_accessor_class_codeflag = &_grib_accessor_class_codeflag;
+
+
+void grib_accessor_class_codeflag_t::init(grib_accessor* a, const long len, grib_arguments* param){
+    grib_accessor_codeflag_t* self = (grib_accessor_codeflag_t*)a;
+    a->length = len;
+    self->tablename = grib_arguments_get_string(grib_handle_of_accessor(a), param, 0);
+    Assert(a->length >= 0);
+}
+
+int test_bit(long a, long b){
+    DEBUG_ASSERT(b>=0);
+    return a & (1 << b);
+}
+
+int grib_get_codeflag(grib_accessor* a, long code, char* codename){
+    const grib_accessor_codeflag_t* self = (grib_accessor_codeflag_t*)a;
+    FILE* f = NULL;
+    char fname[1024];
+    char bval[50];
+    char num[50];
+    char* filename = 0;
+    char line[1024];
+    size_t i = 0;
+    int j    = 0;
+    int err  = 0;
+
+    err = grib_recompose_name(grib_handle_of_accessor(a), NULL, self->tablename, fname, 1);
+    if (err) {
+        strncpy(fname, self->tablename, sizeof(fname)-1);
+        fname[sizeof(fname)-1] = '\0';
+    }
+
+    if ((filename = grib_context_full_defs_path(a->context, fname)) == NULL) {
+        grib_context_log(a->context, GRIB_LOG_WARNING, "Cannot open flag table %s", filename);
+        strcpy(codename, "Cannot open flag table");
+        return GRIB_FILE_NOT_FOUND;
+    }
+
+    f = codes_fopen(filename, "r");
+    if (!f) {
+        grib_context_log(a->context, (GRIB_LOG_WARNING) | (GRIB_LOG_PERROR), "Cannot open flag table %s", filename);
+        strcpy(codename, "Cannot open flag table");
+        return GRIB_FILE_NOT_FOUND;
+    }
+
+    // strcpy(codename, self->tablename);
+    // strcat(codename,": ");
+    // j = strlen(codename);
+
+    while (fgets(line, sizeof(line) - 1, f)) {
+        sscanf(line, "%49s %49s", num, bval);
+
+        if (num[0] != '#') {
+            if ((test_bit(code, a->length * 8 - atol(num)) > 0) == atol(bval)) {
+                size_t linelen = strlen(line);
+                codename[j++]  = '(';
+                codename[j++]  = num[0];
+                codename[j++]  = '=';
+                codename[j++]  = bval[0];
+                codename[j++]  = ')';
+                codename[j++]  = ' ';
+                if (j)
+                    codename[j++] = ' ';
+
+                for (i = (strlen(num) + strlen(bval) + 2); i < linelen - 1; i++)
+                    codename[j++] = line[i];
+                if (line[i] != '\n')
+                    codename[j++] = line[i];
+                codename[j++] = ';';
+            }
+        }
+    }
+
+    if (j > 1 && codename[j - 1] == ';')
+        j--;
+    codename[j] = 0;
+
+    strcat(codename, ":");
+    strcat(codename, fname);
+
+    fclose(f);
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_codeflag_t::value_count(grib_accessor* a, long* count){
+    *count = 1;
+    return 0;
+}
+
+void grib_accessor_class_codeflag_t::dump(grib_accessor* a, grib_dumper* dumper){
+    const grib_accessor_codeflag_t* self = (grib_accessor_codeflag_t*)a;
+    long v = 0;
+    char flagname[1024] = {0,};
+    char fname[1024] = {0,};
+
+    size_t llen = 1;
+
+    grib_recompose_name(grib_handle_of_accessor(a), NULL, self->tablename, fname, 1);
+    a->unpack_long(&v, &llen);
+    grib_get_codeflag(a, v, flagname);
+
+    grib_dump_bits(dumper, a, flagname);
+}
diff --git a/src/accessor/grib_accessor_class_codeflag.h b/src/accessor/grib_accessor_class_codeflag.h
new file mode 100644
index 000000000..734369b74
--- /dev/null
+++ b/src/accessor/grib_accessor_class_codeflag.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_codeflag_h
+#define eccodes_accessor_codeflag_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_unsigned.h"
+
+class grib_accessor_codeflag_t : public grib_accessor_unsigned_t
+{
+public:
+    /* Members defined in codeflag */
+    const char* tablename;
+};
+
+class grib_accessor_class_codeflag_t : public grib_accessor_class_unsigned_t
+{
+public:
+    grib_accessor_class_codeflag_t(const char* name) : grib_accessor_class_unsigned_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_codeflag_t{}; }
+    int value_count(grib_accessor*, long*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_codeflag_h */
diff --git a/src/accessor/grib_accessor_class_codetable_title.cc b/src/accessor/grib_accessor_class_codetable_title.cc
new file mode 100644
index 000000000..27d787170
--- /dev/null
+++ b/src/accessor/grib_accessor_class_codetable_title.cc
@@ -0,0 +1,69 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_codetable_title.h"
+#include "grib_accessor_class_codetable.h"
+
+grib_accessor_class_codetable_title_t _grib_accessor_class_codetable_title{"codetable_title"};
+grib_accessor_class* grib_accessor_class_codetable_title = &_grib_accessor_class_codetable_title;
+
+void grib_accessor_class_codetable_title_t::init(grib_accessor* a, const long len, grib_arguments* params){
+    grib_accessor_codetable_title_t* self = (grib_accessor_codetable_title_t*)a;
+    int n                               = 0;
+    self->codetable                     = grib_arguments_get_name(grib_handle_of_accessor(a), params, n++);
+    a->length                           = 0;
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+}
+
+int grib_accessor_class_codetable_title_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_STRING;
+}
+
+int grib_accessor_class_codetable_title_t::unpack_string(grib_accessor* a, char* buffer, size_t* len){
+    grib_accessor_codetable_title_t* self = (grib_accessor_codetable_title_t*)a;
+    grib_codetable* table               = NULL;
+
+    size_t size = 1;
+    long value;
+    int err = GRIB_SUCCESS;
+    char tmp[1024];
+    size_t l                    = 1024;
+    grib_accessor_codetable_t* ca = (grib_accessor_codetable_t*)grib_find_accessor(grib_handle_of_accessor(a), self->codetable);
+
+    if ((err = ((grib_accessor*)ca)->unpack_long(&value, &size)) != GRIB_SUCCESS)
+        return err;
+
+    table = ca->table;
+
+    if (table && (value >= 0) && (value < table->size) && table->entries[value].title) {
+        strcpy(tmp, table->entries[value].title);
+    }
+    else {
+        snprintf(tmp, sizeof(tmp), "%d", (int)value);
+    }
+
+    l = strlen(tmp) + 1;
+
+    if (*len < l) {
+        const char* cclass_name = a->cclass->name;
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
+                         cclass_name, a->name, l, *len);
+        *len = l;
+        return GRIB_BUFFER_TOO_SMALL;
+    }
+
+    strcpy(buffer, tmp);
+    *len = l;
+
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_codetable_title.h b/src/accessor/grib_accessor_class_codetable_title.h
new file mode 100644
index 000000000..e115a9c28
--- /dev/null
+++ b/src/accessor/grib_accessor_class_codetable_title.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_codetable_title_h
+#define eccodes_accessor_codetable_title_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_codetable_title_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in codetable_title */
+    const char* codetable;
+};
+
+class grib_accessor_class_codetable_title_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_codetable_title_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_codetable_title_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_codetable_title_h */
diff --git a/src/accessor/grib_accessor_class_codetable_units.cc b/src/accessor/grib_accessor_class_codetable_units.cc
new file mode 100644
index 000000000..cc2c3815b
--- /dev/null
+++ b/src/accessor/grib_accessor_class_codetable_units.cc
@@ -0,0 +1,70 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_codetable_units.h"
+#include "grib_accessor_class_codetable.h"
+
+grib_accessor_class_codetable_units_t _grib_accessor_class_codetable_units{"codetable_units"};
+grib_accessor_class* grib_accessor_class_codetable_units = &_grib_accessor_class_codetable_units;
+
+void grib_accessor_class_codetable_units_t::init(grib_accessor* a, const long len, grib_arguments* params){
+    grib_accessor_codetable_units_t* self = (grib_accessor_codetable_units_t*)a;
+
+    int n           = 0;
+    self->codetable = grib_arguments_get_name(grib_handle_of_accessor(a), params, n++);
+    a->length       = 0;
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+}
+
+int grib_accessor_class_codetable_units_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_STRING;
+}
+
+int grib_accessor_class_codetable_units_t::unpack_string(grib_accessor* a, char* buffer, size_t* len){
+    grib_accessor_codetable_units_t* self = (grib_accessor_codetable_units_t*)a;
+    grib_codetable* table = NULL;
+
+    size_t size = 1;
+    long value;
+    int err = GRIB_SUCCESS;
+    char tmp[1024];
+    size_t l = sizeof(tmp);
+    grib_accessor_codetable_t* ca = (grib_accessor_codetable_t*)grib_find_accessor(grib_handle_of_accessor(a), self->codetable);
+
+    if ((err = ((grib_accessor*)ca)->unpack_long(&value, &size)) != GRIB_SUCCESS)
+        return err;
+
+    table = ca->table;
+
+    if (table && (value >= 0) && (value < table->size) && table->entries[value].units) {
+        strcpy(tmp, table->entries[value].units);
+    }
+    else {
+        snprintf(tmp, sizeof(tmp), "%d", (int)value);
+    }
+
+    l = strlen(tmp) + 1;
+
+    if (*len < l) {
+        const char* cclass_name = a->cclass->name;
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
+                         cclass_name, a->name, l, *len);
+        *len = l;
+        return GRIB_BUFFER_TOO_SMALL;
+    }
+
+    strcpy(buffer, tmp);
+    *len = l;
+
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_codetable_units.h b/src/accessor/grib_accessor_class_codetable_units.h
new file mode 100644
index 000000000..b5cfb75c8
--- /dev/null
+++ b/src/accessor/grib_accessor_class_codetable_units.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_codetable_units_h
+#define eccodes_accessor_codetable_units_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_codetable_units_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in codetable_units */
+    const char* codetable;
+};
+
+class grib_accessor_class_codetable_units_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_codetable_units_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_codetable_units_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_codetable_units_h */
diff --git a/src/accessor/todo/grib_accessor_class_concept.cc b/src/accessor/grib_accessor_class_concept.cc
similarity index 71%
rename from src/accessor/todo/grib_accessor_class_concept.cc
rename to src/accessor/grib_accessor_class_concept.cc
index 6fa4122f8..55f535cb2 100644
--- a/src/accessor/todo/grib_accessor_class_concept.cc
+++ b/src/accessor/grib_accessor_class_concept.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,113 +9,12 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-
-/*******************************************************
- *   Enrico Fucile
- ******************************************************/
-
 #include "grib_api_internal.h"
+#include "grib_accessor_class_concept.h"
 
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = unpack_double;pack_double
-   IMPLEMENTS = unpack_string;pack_string;string_length
-   IMPLEMENTS = unpack_long;pack_long;destroy
-   IMPLEMENTS = init;dump;value_count;get_native_type
-   IMPLEMENTS = compare
-    END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int pack_string(grib_accessor*, const char*, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static size_t string_length(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-static void destroy(grib_context*, grib_accessor*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static int compare(grib_accessor*, grib_accessor*);
-
-typedef struct grib_accessor_concept
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in concept */
-} grib_accessor_concept;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_concept = {
-    &grib_accessor_class_gen,                      /* super */
-    "concept",                      /* name */
-    sizeof(grib_accessor_concept),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    &destroy,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    &string_length,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    &pack_string,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    &compare,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
+grib_accessor_class_concept_t _grib_accessor_class_concept{"concept"};
 grib_accessor_class* grib_accessor_class_concept = &_grib_accessor_class_concept;
 
-/* END_CLASS_IMP */
 
 #define MAX_CONCEPT_STRING_LENGTH 255
 
@@ -134,19 +34,16 @@ GRIB_INLINE static int grib_inline_strcmp(const char* a, const char* b)
     return (*a == 0 && *b == 0) ? 0 : 1;
 }
 
-static void init(grib_accessor* a, const long len, grib_arguments* args)
-{
+void grib_accessor_class_concept_t::init(grib_accessor* a, const long len, grib_arguments* args){
     a->length = 0;
 }
 
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
+void grib_accessor_class_concept_t::dump(grib_accessor* a, grib_dumper* dumper){
     grib_dump_string(dumper, a, NULL);
 }
 
 /* Return 1 (=True) or 0 (=False) */
-static int concept_condition_expression_true(grib_handle* h, grib_concept_condition* c)
-{
+int concept_condition_expression_true(grib_handle* h, grib_concept_condition* c){
     long lval;
     long lres      = 0;
     int ok         = FALSE; /* Boolean */
@@ -190,8 +87,7 @@ static int concept_condition_expression_true(grib_handle* h, grib_concept_condit
 }
 
 /* Return 1 (=True) or 0 (=False) */
-static int concept_condition_iarray_true(grib_handle* h, grib_concept_condition* c)
-{
+int concept_condition_iarray_true(grib_handle* h, grib_concept_condition* c){
     long* val = NULL;
     size_t size = 0, i;
     int ret; /* Boolean */
@@ -221,8 +117,7 @@ static int concept_condition_iarray_true(grib_handle* h, grib_concept_condition*
 }
 
 /* Return 1 (=True) or 0 (=False) */
-static int concept_condition_true(grib_handle* h, grib_concept_condition* c)
-{
+int concept_condition_true(grib_handle* h, grib_concept_condition* c){
     if (c->expression == NULL)
         return concept_condition_iarray_true(h, c);
     else
@@ -263,8 +158,7 @@ static const char* concept_evaluate(grib_accessor* a)
 
 #define MAX_NUM_CONCEPT_VALUES 40
 
-static int concept_conditions_expression_apply(grib_handle* h, grib_concept_condition* e, grib_values* values, grib_sarray* sa, int* n)
-{
+int concept_conditions_expression_apply(grib_handle* h, grib_concept_condition* e, grib_values* values, grib_sarray* sa, int* n){
     long lres   = 0;
     double dres = 0.0;
     int count   = *n;
@@ -295,30 +189,26 @@ static int concept_conditions_expression_apply(grib_handle* h, grib_concept_cond
     return err;
 }
 
-static int concept_conditions_iarray_apply(grib_handle* h, grib_concept_condition* c)
-{
+int concept_conditions_iarray_apply(grib_handle* h, grib_concept_condition* c){
     size_t size = grib_iarray_used_size(c->iarray);
     return grib_set_long_array(h, c->name, c->iarray->v, size);
 }
 
-static int concept_conditions_apply(grib_handle* h, grib_concept_condition* c, grib_values* values, grib_sarray* sa, int* n)
-{
+int concept_conditions_apply(grib_handle* h, grib_concept_condition* c, grib_values* values, grib_sarray* sa, int* n){
     if (c->expression == NULL)
         return concept_conditions_iarray_apply(h, c);
     else
         return concept_conditions_expression_apply(h, c, values, sa, n);
 }
 
-static int cmpstringp(const void* p1, const void* p2)
-{
+int cmpstringp(const void* p1, const void* p2){
     /* The actual arguments to this function are "pointers to
        pointers to char", but strcmp(3) arguments are "pointers
        to char", hence the following cast plus dereference */
     return strcmp(*(char* const*)p1, *(char* const*)p2);
 }
 
-static bool blacklisted(grib_handle* h, long edition, const char* concept_name, const char* concept_value)
-{
+bool blacklisted(grib_handle* h, long edition, const char* concept_name, const char* concept_value){
     if ( strcmp(concept_name, "packingType")==0 ) {
         char input_packing_type[100];
         size_t len = sizeof(input_packing_type);
@@ -345,8 +235,7 @@ static bool blacklisted(grib_handle* h, long edition, const char* concept_name,
     return false;
 }
 
-static int grib_concept_apply(grib_accessor* a, const char* name)
-{
+int grib_concept_apply(grib_accessor* a, const char* name){
     int err                   = 0;
     int count                 = 0;
     grib_concept_condition* e = NULL;
@@ -440,13 +329,11 @@ static int grib_concept_apply(grib_accessor* a, const char* name)
     return err;
 }
 
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
+int grib_accessor_class_concept_t::pack_double(grib_accessor* a, const double* val, size_t* len){
     return GRIB_NOT_IMPLEMENTED;
 }
 
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
+int grib_accessor_class_concept_t::pack_long(grib_accessor* a, const long* val, size_t* len){
     char buf[80];
     size_t s;
     snprintf(buf, sizeof(buf), "%ld", *val);
@@ -458,8 +345,7 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
     return pack_string(a, buf, &s);
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
+int grib_accessor_class_concept_t::unpack_double(grib_accessor* a, double* val, size_t* len){
     /*
      * If we want to have a condition which contains tests for paramId as well
      * as a floating point key, then need to be able to evaluate paramId as a
@@ -491,8 +377,7 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     return ret;
 }
 
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
+int grib_accessor_class_concept_t::unpack_long(grib_accessor* a, long* val, size_t* len){
     const char* p = concept_evaluate(a);
 
     if (!p) {
@@ -527,8 +412,7 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int get_native_type(grib_accessor* a)
-{
+int grib_accessor_class_concept_t::get_native_type(grib_accessor* a){
     int type = GRIB_TYPE_STRING;
     if (a->flags & GRIB_ACCESSOR_FLAG_LONG_TYPE)
         type = GRIB_TYPE_LONG;
@@ -536,14 +420,12 @@ static int get_native_type(grib_accessor* a)
     return type;
 }
 
-static void destroy(grib_context* c, grib_accessor* a)
-{
-    //grib_accessor_concept *self = (grib_accessor_concept*)a;
+void grib_accessor_class_concept_t::destroy(grib_context* c, grib_accessor* a){
+    //grib_accessor_concept_t *self = (grib_accessor_concept_t*)a;
     //grib_context_free(c,self->cval);
 }
 
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
+int grib_accessor_class_concept_t::unpack_string(grib_accessor* a, char* val, size_t* len){
     size_t slen;
     const char* p = concept_evaluate(a);
 
@@ -576,24 +458,20 @@ static int unpack_string(grib_accessor* a, char* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int pack_string(grib_accessor* a, const char* val, size_t* len)
-{
+int grib_accessor_class_concept_t::pack_string(grib_accessor* a, const char* val, size_t* len){
     return grib_concept_apply(a, val);
 }
 
-static size_t string_length(grib_accessor* a)
-{
+size_t grib_accessor_class_concept_t::string_length(grib_accessor* a){
     return MAX_CONCEPT_STRING_LENGTH;
 }
 
-static int value_count(grib_accessor* a, long* count)
-{
+int grib_accessor_class_concept_t::value_count(grib_accessor* a, long* count){
     *count = 1;
     return 0;
 }
 
-static int compare(grib_accessor* a, grib_accessor* b)
-{
+int grib_accessor_class_concept_t::compare(grib_accessor* a, grib_accessor* b){
     int retval = 0;
     char* aval = 0;
     char* bval = 0;
@@ -603,12 +481,10 @@ static int compare(grib_accessor* a, grib_accessor* b)
     int err     = 0;
     long count  = 0;
 
-    err = grib_value_count(a, &count);
-    if (err) return err;
+    err = a->value_count(&count);    if (err) return err;
     alen = count;
 
-    err = grib_value_count(b, &count);
-    if (err) return err;
+    err = b->value_count(&count);    if (err) return err;
     blen = count;
 
     if (alen != blen)
@@ -619,10 +495,8 @@ static int compare(grib_accessor* a, grib_accessor* b)
     aval = (char*)grib_context_malloc(a->context, alen * sizeof(char));
     bval = (char*)grib_context_malloc(b->context, blen * sizeof(char));
 
-    err = grib_unpack_string(a, aval, &alen);
-    if (err) return err;
-    err = grib_unpack_string(b, bval, &blen);
-    if (err) return err;
+    err = a->unpack_string(aval, &alen);    if (err) return err;
+    err = b->unpack_string(bval, &blen);    if (err) return err;
 
     retval = GRIB_SUCCESS;
     if (!aval || !bval || grib_inline_strcmp(aval, bval))
diff --git a/src/accessor/grib_accessor_class_concept.h b/src/accessor/grib_accessor_class_concept.h
new file mode 100644
index 000000000..99405ed48
--- /dev/null
+++ b/src/accessor/grib_accessor_class_concept.h
@@ -0,0 +1,43 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_concept_h
+#define eccodes_accessor_concept_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_concept_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in concept */
+};
+
+class grib_accessor_class_concept_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_concept_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_concept_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int pack_string(grib_accessor*, const char*, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    size_t string_length(grib_accessor*) override;
+    int value_count(grib_accessor*, long*) override;
+    void destroy(grib_context*, grib_accessor*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    int compare(grib_accessor*, grib_accessor*) override;
+};
+#endif /* eccodes_accessor_concept_h */
diff --git a/src/accessor/grib_accessor_class_count_file.cc b/src/accessor/grib_accessor_class_count_file.cc
new file mode 100644
index 000000000..9e88700a3
--- /dev/null
+++ b/src/accessor/grib_accessor_class_count_file.cc
@@ -0,0 +1,28 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_count_file.h"
+
+grib_accessor_class_count_file_t _grib_accessor_class_count_file{"count_file"};
+grib_accessor_class* grib_accessor_class_count_file = &_grib_accessor_class_count_file;
+
+
+void grib_accessor_class_count_file_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->length = 0;
+}
+
+int grib_accessor_class_count_file_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    *val = grib_context_get_handle_file_count(a->context);
+    *len = 1;
+    return 0;
+}
diff --git a/src/accessor/grib_accessor_class_count_file.h b/src/accessor/grib_accessor_class_count_file.h
new file mode 100644
index 000000000..4b9a0b4f0
--- /dev/null
+++ b/src/accessor/grib_accessor_class_count_file.h
@@ -0,0 +1,32 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_count_file_h
+#define eccodes_accessor_count_file_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_count_file_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in count_file */
+};
+
+class grib_accessor_class_count_file_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_count_file_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_count_file_t{}; }
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_count_file_h */
diff --git a/src/accessor/todo/grib_accessor_class_count_missing.cc b/src/accessor/grib_accessor_class_count_missing.cc
similarity index 55%
rename from src/accessor/todo/grib_accessor_class_count_missing.cc
rename to src/accessor/grib_accessor_class_count_missing.cc
index a4ed76841..f0e74d165 100644
--- a/src/accessor/todo/grib_accessor_class_count_missing.cc
+++ b/src/accessor/grib_accessor_class_count_missing.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,103 +10,11 @@
  */
 
 #include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = init;
-   IMPLEMENTS = value_count
-   MEMBERS    = const char* bitmap
-   MEMBERS    = const char* unusedBitsInBitmap
-   MEMBERS    = const char* numberOfDataPoints
-   MEMBERS    = const char* missingValueManagementUsed
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_count_missing
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in count_missing */
-    const char* bitmap;
-    const char* unusedBitsInBitmap;
-    const char* numberOfDataPoints;
-    const char* missingValueManagementUsed;
-} grib_accessor_count_missing;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_count_missing = {
-    &grib_accessor_class_long,                      /* super */
-    "count_missing",                      /* name */
-    sizeof(grib_accessor_count_missing),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_count_missing.h"
 
+grib_accessor_class_count_missing_t _grib_accessor_class_count_missing{"count_missing"};
 grib_accessor_class* grib_accessor_class_count_missing = &_grib_accessor_class_count_missing;
 
-/* END_CLASS_IMP */
 
 static const unsigned char bitsoff[] = {
     8, 7, 7, 6, 7, 6, 6, 5, 7, 6, 6, 5, 6, 5, 5, 4, 7,
@@ -126,10 +35,9 @@ static const unsigned char bitsoff[] = {
     0
 };
 
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
+void grib_accessor_class_count_missing_t::init(grib_accessor* a, const long len, grib_arguments* arg){
     int n                             = 0;
-    grib_accessor_count_missing* self = (grib_accessor_count_missing*)a;
+    grib_accessor_count_missing_t* self = (grib_accessor_count_missing_t*)a;
     grib_handle* h = grib_handle_of_accessor(a);
     a->length                         = 0;
     a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
@@ -141,8 +49,7 @@ static void init(grib_accessor* a, const long len, grib_arguments* arg)
 
 static const int used[] = { 0, 1, 3, 7, 15, 31, 63, 127, 255 };
 
-static int get_count_of_missing_values(grib_handle* h, long* p_count_of_missing)
-{
+int get_count_of_missing_values(grib_handle* h, long* p_count_of_missing){
     int err = 0;
     long count_of_missing = 0;
     size_t vsize = 0, ii = 0;
@@ -165,9 +72,8 @@ static int get_count_of_missing_values(grib_handle* h, long* p_count_of_missing)
 
     return GRIB_SUCCESS;
 }
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_count_missing* self = (grib_accessor_count_missing*)a;
+int grib_accessor_class_count_missing_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_count_missing_t* self = (grib_accessor_count_missing_t*)a;
     unsigned char* p;
     int i;
     long size               = 0;
@@ -195,9 +101,7 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
         return GRIB_SUCCESS;
     }
 
-    size   = grib_byte_count(bitmap);
-    offset = grib_byte_offset(bitmap);
-
+    size   = bitmap->byte_count();    offset = bitmap->byte_offset();
     if (grib_get_long(h, self->unusedBitsInBitmap, &unusedBitsInBitmap) != GRIB_SUCCESS) {
         if (grib_get_long(h, self->numberOfDataPoints, &numberOfDataPoints) != GRIB_SUCCESS) {
             grib_context_log(a->context, GRIB_LOG_ERROR, "Unable to count missing values");
@@ -224,8 +128,7 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int value_count(grib_accessor* a, long* count)
-{
+int grib_accessor_class_count_missing_t::value_count(grib_accessor* a, long* count){
     *count = 1;
     return 0;
 }
diff --git a/src/accessor/grib_accessor_class_count_missing.h b/src/accessor/grib_accessor_class_count_missing.h
new file mode 100644
index 000000000..fbf583109
--- /dev/null
+++ b/src/accessor/grib_accessor_class_count_missing.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_count_missing_h
+#define eccodes_accessor_count_missing_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_count_missing_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in count_missing */
+    const char* bitmap;
+    const char* unusedBitsInBitmap;
+    const char* numberOfDataPoints;
+    const char* missingValueManagementUsed;
+};
+
+class grib_accessor_class_count_missing_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_count_missing_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_count_missing_t{}; }
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_count_missing_h */
diff --git a/src/accessor/grib_accessor_class_count_total.cc b/src/accessor/grib_accessor_class_count_total.cc
new file mode 100644
index 000000000..2c2c69c3c
--- /dev/null
+++ b/src/accessor/grib_accessor_class_count_total.cc
@@ -0,0 +1,28 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_count_total.h"
+
+grib_accessor_class_count_total_t _grib_accessor_class_count_total{"count_total"};
+grib_accessor_class* grib_accessor_class_count_total = &_grib_accessor_class_count_total;
+
+
+void grib_accessor_class_count_total_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->length = 0;
+}
+
+int grib_accessor_class_count_total_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    *val = grib_context_get_handle_total_count(a->context);
+    *len = 1;
+    return 0;
+}
diff --git a/src/accessor/grib_accessor_class_count_total.h b/src/accessor/grib_accessor_class_count_total.h
new file mode 100644
index 000000000..ab044e8a9
--- /dev/null
+++ b/src/accessor/grib_accessor_class_count_total.h
@@ -0,0 +1,32 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_count_total_h
+#define eccodes_accessor_count_total_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_count_total_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in count_total */
+};
+
+class grib_accessor_class_count_total_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_count_total_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_count_total_t{}; }
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_count_total_h */
diff --git a/src/accessor/todo/grib_accessor_class_data_apply_bitmap.cc b/src/accessor/grib_accessor_class_data_apply_bitmap.cc
similarity index 64%
rename from src/accessor/todo/grib_accessor_class_data_apply_bitmap.cc
rename to src/accessor/grib_accessor_class_data_apply_bitmap.cc
index 675e7b3de..ac7fccc1c 100644
--- a/src/accessor/todo/grib_accessor_class_data_apply_bitmap.cc
+++ b/src/accessor/grib_accessor_class_data_apply_bitmap.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,123 +9,16 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-#include "grib_value.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = init
-   IMPLEMENTS = unpack_double;unpack_double_element;unpack_double_element_set
-   IMPLEMENTS = unpack_float
-   IMPLEMENTS = pack_double
-   IMPLEMENTS = value_count
-   IMPLEMENTS = dump;get_native_type
-   IMPLEMENTS = compare
-   MEMBERS=const char*  coded_values
-   MEMBERS=const char*  bitmap
-   MEMBERS=const char*  missing_value
-   MEMBERS=const char*  number_of_data_points
-   MEMBERS=const char*  number_of_values
-   MEMBERS=const char*  binary_scale_factor
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_float(grib_accessor*, float* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static int compare(grib_accessor*, grib_accessor*);
-static int unpack_double_element(grib_accessor*, size_t i, double* val);
-static int unpack_double_element_set(grib_accessor*, const size_t* index_array, size_t len, double* val_array);
-
-typedef struct grib_accessor_data_apply_bitmap
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in data_apply_bitmap */
-    const char*  coded_values;
-    const char*  bitmap;
-    const char*  missing_value;
-    const char*  number_of_data_points;
-    const char*  number_of_values;
-    const char*  binary_scale_factor;
-} grib_accessor_data_apply_bitmap;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_data_apply_bitmap = {
-    &grib_accessor_class_gen,                      /* super */
-    "data_apply_bitmap",                      /* name */
-    sizeof(grib_accessor_data_apply_bitmap),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    &unpack_float,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    &compare,                    /* compare vs. another accessor */
-    &unpack_double_element,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    &unpack_double_element_set,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_api_internal.h"
+#include "grib_accessor_class_data_apply_bitmap.h"
 
+grib_accessor_class_data_apply_bitmap_t _grib_accessor_class_data_apply_bitmap{"data_apply_bitmap"};
 grib_accessor_class* grib_accessor_class_data_apply_bitmap = &_grib_accessor_class_data_apply_bitmap;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
+void grib_accessor_class_data_apply_bitmap_t::init(grib_accessor* a, const long v, grib_arguments* args){
     int n                                 = 0;
-    grib_accessor_data_apply_bitmap* self = (grib_accessor_data_apply_bitmap*)a;
+    grib_accessor_data_apply_bitmap_t* self = (grib_accessor_data_apply_bitmap_t*)a;
 
     self->coded_values          = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
     self->bitmap                = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
@@ -135,14 +29,12 @@ static void init(grib_accessor* a, const long v, grib_arguments* args)
 
     a->length = 0;
 }
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
+void grib_accessor_class_data_apply_bitmap_t::dump(grib_accessor* a, grib_dumper* dumper){
     grib_dump_values(dumper, a);
 }
 
-static int value_count(grib_accessor* a, long* count)
-{
-    grib_accessor_data_apply_bitmap* self = (grib_accessor_data_apply_bitmap*)a;
+int grib_accessor_class_data_apply_bitmap_t::value_count(grib_accessor* a, long* count){
+    grib_accessor_data_apply_bitmap_t* self = (grib_accessor_data_apply_bitmap_t*)a;
     size_t len                            = 0;
     int ret                               = 0;
 
@@ -156,9 +48,8 @@ static int value_count(grib_accessor* a, long* count)
     return ret;
 }
 
-static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
-{
-    grib_accessor_data_apply_bitmap* self = (grib_accessor_data_apply_bitmap*)a;
+int grib_accessor_class_data_apply_bitmap_t::unpack_double_element(grib_accessor* a, size_t idx, double* val){
+    grib_accessor_data_apply_bitmap_t* self = (grib_accessor_data_apply_bitmap_t*)a;
     grib_handle* gh      = grib_handle_of_accessor(a);
     int err = 0, i = 0;
     size_t cidx          = 0;
@@ -167,8 +58,7 @@ static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
     size_t n_vals        = 0;
     long nn              = 0;
 
-    err    = grib_value_count(a, &nn);
-    n_vals = nn;
+    err    = a->value_count(&nn);    n_vals = nn;
     if (err)
         return err;
 
@@ -203,9 +93,8 @@ static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
     return grib_get_double_element_internal(gh, self->coded_values, cidx, val);
 }
 
-static int unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array)
-{
-    grib_accessor_data_apply_bitmap* self = (grib_accessor_data_apply_bitmap*)a;
+int grib_accessor_class_data_apply_bitmap_t::unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array){
+    grib_accessor_data_apply_bitmap_t* self = (grib_accessor_data_apply_bitmap_t*)a;
     grib_handle* gh = grib_handle_of_accessor(a);
     int err = 0, all_missing = 1;
     size_t cidx        = 0; /* index into the coded_values array */
@@ -216,8 +105,7 @@ static int unpack_double_element_set(grib_accessor* a, const size_t* index_array
     size_t n_vals = 0, i = 0, j = 0, idx = 0, count_1s = 0, ci = 0;
     long nn = 0;
 
-    err    = grib_value_count(a, &nn);
-    n_vals = nn;
+    err    = a->value_count(&nn);    n_vals = nn;
     if (err) return err;
 
     if (!grib_find_accessor(gh, self->bitmap))
@@ -283,9 +171,8 @@ static int unpack_double_element_set(grib_accessor* a, const size_t* index_array
     return GRIB_SUCCESS;
 }
 
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_data_apply_bitmap* self = (grib_accessor_data_apply_bitmap*)a;
+int grib_accessor_class_data_apply_bitmap_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_data_apply_bitmap_t* self = (grib_accessor_data_apply_bitmap_t*)a;
     int err                               = 0;
     size_t bmaplen                        = *len;
     long coded_n_vals                     = 0;
@@ -344,10 +231,9 @@ static int pack_double(grib_accessor* a, const double* val, size_t* len)
 }
 
 template <typename T>
-static int unpack(grib_accessor* a, T* val, size_t* len)
-{
+int unpack(grib_accessor* a, T* val, size_t* len){
     static_assert(std::is_floating_point<T>::value, "Requires floating point numbers");
-    grib_accessor_data_apply_bitmap* self = (grib_accessor_data_apply_bitmap*)a;
+    grib_accessor_data_apply_bitmap_t* self = (grib_accessor_data_apply_bitmap_t*)a;
 
     size_t i             = 0;
     size_t j             = 0;
@@ -358,8 +244,7 @@ static int unpack(grib_accessor* a, T* val, size_t* len)
     T* coded_vals   = NULL;
     double missing_value = 0;
 
-    err    = grib_value_count(a, &nn);
-    n_vals = nn;
+    err    = a->value_count(&nn);    n_vals = nn;
     if (err)
         return err;
 
@@ -426,26 +311,22 @@ static int unpack(grib_accessor* a, T* val, size_t* len)
     return err;
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
+int grib_accessor_class_data_apply_bitmap_t::unpack_double(grib_accessor* a, double* val, size_t* len){
     return unpack<double>(a, val, len);
 }
 
-static int unpack_float(grib_accessor* a, float* val, size_t* len)
-{
+int grib_accessor_class_data_apply_bitmap_t::unpack_float(grib_accessor* a, float* val, size_t* len){
     return unpack<float>(a, val, len);
 }
 
-static int get_native_type(grib_accessor* a)
-{
-    //grib_accessor_data_apply_bitmap* self =  (grib_accessor_data_apply_bitmap*)a;
+int grib_accessor_class_data_apply_bitmap_t::get_native_type(grib_accessor* a){
+    //grib_accessor_data_apply_bitmap_t* self =  (grib_accessor_data_apply_bitmap_t*)a;
     //return grib_accessor_get_native_type(grib_find_accessor(grib_handle_of_accessor(a),self->coded_values));
 
     return GRIB_TYPE_DOUBLE;
 }
 
-static int compare(grib_accessor* a, grib_accessor* b)
-{
+int grib_accessor_class_data_apply_bitmap_t::compare(grib_accessor* a, grib_accessor* b){
     int retval   = GRIB_SUCCESS;
     double* aval = 0;
     double* bval = 0;
@@ -455,13 +336,11 @@ static int compare(grib_accessor* a, grib_accessor* b)
     int err     = 0;
     long count  = 0;
 
-    err = grib_value_count(a, &count);
-    if (err)
+    err = a->value_count(&count);    if (err)
         return err;
     alen = count;
 
-    err = grib_value_count(b, &count);
-    if (err)
+    err = b->value_count(&count);    if (err)
         return err;
     blen = count;
 
@@ -471,9 +350,7 @@ static int compare(grib_accessor* a, grib_accessor* b)
     aval = (double*)grib_context_malloc(a->context, alen * sizeof(double));
     bval = (double*)grib_context_malloc(b->context, blen * sizeof(double));
 
-    grib_unpack_double(a, aval, &alen);
-    grib_unpack_double(b, bval, &blen);
-
+    a->unpack_double(aval, &alen);    b->unpack_double(bval, &blen);
     retval = GRIB_SUCCESS;
     for (size_t i=0; i<alen && retval == GRIB_SUCCESS; ++i) {
         if (aval[i] != bval[i]) retval = GRIB_DOUBLE_VALUE_MISMATCH;
diff --git a/src/accessor/grib_accessor_class_data_apply_bitmap.h b/src/accessor/grib_accessor_class_data_apply_bitmap.h
new file mode 100644
index 000000000..42091e75d
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_apply_bitmap.h
@@ -0,0 +1,46 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_apply_bitmap_h
+#define eccodes_accessor_data_apply_bitmap_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_data_apply_bitmap_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in data_apply_bitmap */
+    const char*  coded_values;
+    const char*  bitmap;
+    const char*  missing_value;
+    const char*  number_of_data_points;
+    const char*  number_of_values;
+    const char*  binary_scale_factor;
+};
+
+class grib_accessor_class_data_apply_bitmap_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_data_apply_bitmap_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_apply_bitmap_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_float(grib_accessor*, float* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    int compare(grib_accessor*, grib_accessor*) override;
+    int unpack_double_element(grib_accessor*, size_t i, double* val) override;
+    int unpack_double_element_set(grib_accessor*, const size_t* index_array, size_t len, double* val_array) override;
+};
+#endif /* eccodes_accessor_data_apply_bitmap_h */
diff --git a/src/accessor/todo/grib_accessor_class_data_apply_boustrophedonic.cc b/src/accessor/grib_accessor_class_data_apply_boustrophedonic.cc
similarity index 61%
rename from src/accessor/todo/grib_accessor_class_data_apply_boustrophedonic.cc
rename to src/accessor/grib_accessor_class_data_apply_boustrophedonic.cc
index e01917384..ef36eb2b2 100644
--- a/src/accessor/todo/grib_accessor_class_data_apply_boustrophedonic.cc
+++ b/src/accessor/grib_accessor_class_data_apply_boustrophedonic.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,118 +10,15 @@
  */
 
 #include "grib_api_internal.h"
+#include "grib_accessor_class_data_apply_boustrophedonic.h"
 
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = init
-   IMPLEMENTS = unpack_double;unpack_double_element;unpack_double_element_set
-   IMPLEMENTS = unpack_float
-   IMPLEMENTS = pack_double
-   IMPLEMENTS = value_count
-   IMPLEMENTS = dump;get_native_type
-   MEMBERS=const char*  values
-   MEMBERS=const char*  numberOfRows
-   MEMBERS=const char*  numberOfColumns
-   MEMBERS=const char*  numberOfPoints
-   MEMBERS=const char*  pl
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_float(grib_accessor*, float* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static int unpack_double_element(grib_accessor*, size_t i, double* val);
-static int unpack_double_element_set(grib_accessor*, const size_t* index_array, size_t len, double* val_array);
-
-typedef struct grib_accessor_data_apply_boustrophedonic
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in data_apply_boustrophedonic */
-    const char*  values;
-    const char*  numberOfRows;
-    const char*  numberOfColumns;
-    const char*  numberOfPoints;
-    const char*  pl;
-} grib_accessor_data_apply_boustrophedonic;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_data_apply_boustrophedonic = {
-    &grib_accessor_class_gen,                      /* super */
-    "data_apply_boustrophedonic",                      /* name */
-    sizeof(grib_accessor_data_apply_boustrophedonic),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    &unpack_float,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    &unpack_double_element,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    &unpack_double_element_set,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
+grib_accessor_class_data_apply_boustrophedonic_t _grib_accessor_class_data_apply_boustrophedonic{"data_apply_boustrophedonic"};
 grib_accessor_class* grib_accessor_class_data_apply_boustrophedonic = &_grib_accessor_class_data_apply_boustrophedonic;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
+void grib_accessor_class_data_apply_boustrophedonic_t::init(grib_accessor* a, const long v, grib_arguments* args){
     int n = 0;
-    grib_accessor_data_apply_boustrophedonic* self = (grib_accessor_data_apply_boustrophedonic*)a;
+    grib_accessor_data_apply_boustrophedonic_t* self = (grib_accessor_data_apply_boustrophedonic_t*)a;
 
     self->values          = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
     self->numberOfRows    = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
@@ -130,14 +28,12 @@ static void init(grib_accessor* a, const long v, grib_arguments* args)
 
     a->length = 0;
 }
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
+void grib_accessor_class_data_apply_boustrophedonic_t::dump(grib_accessor* a, grib_dumper* dumper){
     grib_dump_values(dumper, a);
 }
 
-static int value_count(grib_accessor* a, long* numberOfPoints)
-{
-    grib_accessor_data_apply_boustrophedonic* self = (grib_accessor_data_apply_boustrophedonic*)a;
+int grib_accessor_class_data_apply_boustrophedonic_t::value_count(grib_accessor* a, long* numberOfPoints){
+    grib_accessor_data_apply_boustrophedonic_t* self = (grib_accessor_data_apply_boustrophedonic_t*)a;
     int ret = 0;
 
     *numberOfPoints = 0;
@@ -147,9 +43,8 @@ static int value_count(grib_accessor* a, long* numberOfPoints)
 }
 
 template <typename T>
-static int unpack(grib_accessor* a, T* val, size_t* len)
-{
-    grib_accessor_data_apply_boustrophedonic* self = (grib_accessor_data_apply_boustrophedonic*)a;
+int unpack(grib_accessor* a, T* val, size_t* len){
+    grib_accessor_data_apply_boustrophedonic_t* self = (grib_accessor_data_apply_boustrophedonic_t*)a;
 
     size_t plSize     = 0;
     long* pl          = 0;
@@ -242,18 +137,15 @@ static int unpack(grib_accessor* a, T* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
+int grib_accessor_class_data_apply_boustrophedonic_t::unpack_double(grib_accessor* a, double* val, size_t* len){
     return unpack<double>(a, val, len);
 }
 
-static int unpack_float(grib_accessor* a, float* val, size_t* len)
-{
+int grib_accessor_class_data_apply_boustrophedonic_t::unpack_float(grib_accessor* a, float* val, size_t* len){
     return unpack<float>(a, val, len);
 }
 
-static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
-{
+int grib_accessor_class_data_apply_boustrophedonic_t::unpack_double_element(grib_accessor* a, size_t idx, double* val){
     size_t size;
     double* values;
     int err = 0;
@@ -276,8 +168,7 @@ static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
     return GRIB_SUCCESS;
 }
 
-static int unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array)
-{
+int grib_accessor_class_data_apply_boustrophedonic_t::unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array){
     size_t size = 0, i = 0;
     double* values;
     int err = 0;
@@ -304,9 +195,8 @@ static int unpack_double_element_set(grib_accessor* a, const size_t* index_array
     return GRIB_SUCCESS;
 }
 
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_data_apply_boustrophedonic* self = (grib_accessor_data_apply_boustrophedonic*)a;
+int grib_accessor_class_data_apply_boustrophedonic_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_data_apply_boustrophedonic_t* self = (grib_accessor_data_apply_boustrophedonic_t*)a;
 
     size_t plSize     = 0;
     long* pl          = 0;
@@ -388,7 +278,6 @@ static int pack_double(grib_accessor* a, const double* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int get_native_type(grib_accessor* a)
-{
+int grib_accessor_class_data_apply_boustrophedonic_t::get_native_type(grib_accessor* a){
     return GRIB_TYPE_DOUBLE;
 }
diff --git a/src/accessor/grib_accessor_class_data_apply_boustrophedonic.h b/src/accessor/grib_accessor_class_data_apply_boustrophedonic.h
new file mode 100644
index 000000000..a0358195f
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_apply_boustrophedonic.h
@@ -0,0 +1,44 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_apply_boustrophedonic_h
+#define eccodes_accessor_data_apply_boustrophedonic_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_data_apply_boustrophedonic_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in data_apply_boustrophedonic */
+    const char*  values;
+    const char*  numberOfRows;
+    const char*  numberOfColumns;
+    const char*  numberOfPoints;
+    const char*  pl;
+};
+
+class grib_accessor_class_data_apply_boustrophedonic_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_data_apply_boustrophedonic_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_apply_boustrophedonic_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_float(grib_accessor*, float* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    int unpack_double_element(grib_accessor*, size_t i, double* val) override;
+    int unpack_double_element_set(grib_accessor*, const size_t* index_array, size_t len, double* val_array) override;
+};
+#endif /* eccodes_accessor_data_apply_boustrophedonic_h */
diff --git a/src/accessor/todo/grib_accessor_class_data_apply_boustrophedonic_bitmap.cc b/src/accessor/grib_accessor_class_data_apply_boustrophedonic_bitmap.cc
similarity index 69%
rename from src/accessor/todo/grib_accessor_class_data_apply_boustrophedonic_bitmap.cc
rename to src/accessor/grib_accessor_class_data_apply_boustrophedonic_bitmap.cc
index b68e362db..217431b43 100644
--- a/src/accessor/todo/grib_accessor_class_data_apply_boustrophedonic_bitmap.cc
+++ b/src/accessor/grib_accessor_class_data_apply_boustrophedonic_bitmap.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,121 +10,15 @@
  */
 
 #include "grib_api_internal.h"
+#include "grib_accessor_class_data_apply_boustrophedonic_bitmap.h"
 
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = init
-   IMPLEMENTS = unpack_double;unpack_double_element;unpack_double_element_set
-   IMPLEMENTS = pack_double
-   IMPLEMENTS = value_count
-   IMPLEMENTS = dump;get_native_type
-   MEMBERS=const char*  coded_values
-   MEMBERS=const char*  bitmap
-   MEMBERS=const char*  missing_value
-   MEMBERS=const char*  binary_scale_factor
-   MEMBERS=const char*  numberOfRows
-   MEMBERS=const char*  numberOfColumns
-   MEMBERS=const char*  numberOfPoints
-
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static int unpack_double_element(grib_accessor*, size_t i, double* val);
-static int unpack_double_element_set(grib_accessor*, const size_t* index_array, size_t len, double* val_array);
-
-typedef struct grib_accessor_data_apply_boustrophedonic_bitmap
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in data_apply_boustrophedonic_bitmap */
-    const char*  coded_values;
-    const char*  bitmap;
-    const char*  missing_value;
-    const char*  binary_scale_factor;
-    const char*  numberOfRows;
-    const char*  numberOfColumns;
-    const char*  numberOfPoints;
-} grib_accessor_data_apply_boustrophedonic_bitmap;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_data_apply_boustrophedonic_bitmap = {
-    &grib_accessor_class_gen,                      /* super */
-    "data_apply_boustrophedonic_bitmap",                      /* name */
-    sizeof(grib_accessor_data_apply_boustrophedonic_bitmap),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    &unpack_double_element,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    &unpack_double_element_set,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
+grib_accessor_class_data_apply_boustrophedonic_bitmap_t _grib_accessor_class_data_apply_boustrophedonic_bitmap{"data_apply_boustrophedonic_bitmap"};
 grib_accessor_class* grib_accessor_class_data_apply_boustrophedonic_bitmap = &_grib_accessor_class_data_apply_boustrophedonic_bitmap;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
+void grib_accessor_class_data_apply_boustrophedonic_bitmap_t::init(grib_accessor* a, const long v, grib_arguments* args){
     int n                                                 = 0;
-    grib_accessor_data_apply_boustrophedonic_bitmap* self = (grib_accessor_data_apply_boustrophedonic_bitmap*)a;
+    grib_accessor_data_apply_boustrophedonic_bitmap_t* self = (grib_accessor_data_apply_boustrophedonic_bitmap_t*)a;
     grib_handle* gh                                       = grib_handle_of_accessor(a);
 
     self->coded_values        = grib_arguments_get_name(gh, args, n++);
@@ -138,14 +33,12 @@ static void init(grib_accessor* a, const long v, grib_arguments* args)
     a->length = 0;
 }
 
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
+void grib_accessor_class_data_apply_boustrophedonic_bitmap_t::dump(grib_accessor* a, grib_dumper* dumper){
     grib_dump_values(dumper, a);
 }
 
-static int value_count(grib_accessor* a, long* count)
-{
-    grib_accessor_data_apply_boustrophedonic_bitmap* self = (grib_accessor_data_apply_boustrophedonic_bitmap*)a;
+int grib_accessor_class_data_apply_boustrophedonic_bitmap_t::value_count(grib_accessor* a, long* count){
+    grib_accessor_data_apply_boustrophedonic_bitmap_t* self = (grib_accessor_data_apply_boustrophedonic_bitmap_t*)a;
     grib_handle* gh                                       = grib_handle_of_accessor(a);
     size_t len                                            = 0;
     int ret                                               = 0;
@@ -158,9 +51,8 @@ static int value_count(grib_accessor* a, long* count)
     return ret;
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_data_apply_boustrophedonic_bitmap* self = (grib_accessor_data_apply_boustrophedonic_bitmap*)a;
+int grib_accessor_class_data_apply_boustrophedonic_bitmap_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_data_apply_boustrophedonic_bitmap_t* self = (grib_accessor_data_apply_boustrophedonic_bitmap_t*)a;
     grib_handle* gh                                       = grib_handle_of_accessor(a);
 
     size_t i = 0, j = 0, n_vals = 0, irow = 0;
@@ -171,8 +63,7 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     double missing_value = 0;
     long numberOfPoints, numberOfRows, numberOfColumns;
 
-    err    = grib_value_count(a, &nn);
-    n_vals = nn;
+    err    = a->value_count(&nn);    n_vals = nn;
     if (err)
         return err;
 
@@ -268,9 +159,8 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     return err;
 }
 
-static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
-{
-    grib_accessor_data_apply_boustrophedonic_bitmap* self = (grib_accessor_data_apply_boustrophedonic_bitmap*)a;
+int grib_accessor_class_data_apply_boustrophedonic_bitmap_t::unpack_double_element(grib_accessor* a, size_t idx, double* val){
+    grib_accessor_data_apply_boustrophedonic_bitmap_t* self = (grib_accessor_data_apply_boustrophedonic_bitmap_t*)a;
     grib_handle* gh                                       = grib_handle_of_accessor(a);
     int err = 0, i = 0;
     size_t cidx          = 0;
@@ -279,8 +169,7 @@ static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
     size_t n_vals        = 0;
     long nn              = 0;
 
-    err    = grib_value_count(a, &nn);
-    n_vals = nn;
+    err    = a->value_count(&nn);    n_vals = nn;
     if (err)
         return err;
 
@@ -315,9 +204,8 @@ static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
     return grib_get_double_element_internal(gh, self->coded_values, cidx, val);
 }
 
-static int unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array)
-{
-    grib_accessor_data_apply_boustrophedonic_bitmap* self = (grib_accessor_data_apply_boustrophedonic_bitmap*)a;
+int grib_accessor_class_data_apply_boustrophedonic_bitmap_t::unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array){
+    grib_accessor_data_apply_boustrophedonic_bitmap_t* self = (grib_accessor_data_apply_boustrophedonic_bitmap_t*)a;
     grib_handle* gh                                       = grib_handle_of_accessor(a);
     int err = 0, all_missing = 1;
     size_t cidx        = 0; /* index into the coded_values array */
@@ -328,8 +216,7 @@ static int unpack_double_element_set(grib_accessor* a, const size_t* index_array
     size_t n_vals = 0, i = 0, j = 0, idx = 0, count_1s = 0, ci = 0;
     long nn = 0;
 
-    err    = grib_value_count(a, &nn);
-    n_vals = nn;
+    err    = a->value_count(&nn);    n_vals = nn;
     if (err) return err;
 
     if (!grib_find_accessor(gh, self->bitmap))
@@ -395,9 +282,8 @@ static int unpack_double_element_set(grib_accessor* a, const size_t* index_array
     return GRIB_SUCCESS;
 }
 
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_data_apply_boustrophedonic_bitmap* self = (grib_accessor_data_apply_boustrophedonic_bitmap*)a;
+int grib_accessor_class_data_apply_boustrophedonic_bitmap_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_data_apply_boustrophedonic_bitmap_t* self = (grib_accessor_data_apply_boustrophedonic_bitmap_t*)a;
     grib_handle* gh                                       = grib_handle_of_accessor(a);
     int err                                               = 0;
     size_t bmaplen                                        = *len;
@@ -495,9 +381,8 @@ static int pack_double(grib_accessor* a, const double* val, size_t* len)
     return err;
 }
 
-static int get_native_type(grib_accessor* a)
-{
-    //grib_accessor_data_apply_boustrophedonic_bitmap* self =  (grib_accessor_data_apply_boustrophedonic_bitmap*)a;
+int grib_accessor_class_data_apply_boustrophedonic_bitmap_t::get_native_type(grib_accessor* a){
+    //grib_accessor_data_apply_boustrophedonic_bitmap_t* self =  (grib_accessor_data_apply_boustrophedonic_bitmap_t*)a;
     //return grib_accessor_get_native_type(grib_find_accessor(grib_handle_of_accessor(a),self->coded_values));
 
     return GRIB_TYPE_DOUBLE;
diff --git a/src/accessor/grib_accessor_class_data_apply_boustrophedonic_bitmap.h b/src/accessor/grib_accessor_class_data_apply_boustrophedonic_bitmap.h
new file mode 100644
index 000000000..e92299eab
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_apply_boustrophedonic_bitmap.h
@@ -0,0 +1,45 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_apply_boustrophedonic_bitmap_h
+#define eccodes_accessor_data_apply_boustrophedonic_bitmap_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_data_apply_boustrophedonic_bitmap_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in data_apply_boustrophedonic_bitmap */
+    const char*  coded_values;
+    const char*  bitmap;
+    const char*  missing_value;
+    const char*  binary_scale_factor;
+    const char*  numberOfRows;
+    const char*  numberOfColumns;
+    const char*  numberOfPoints;
+};
+
+class grib_accessor_class_data_apply_boustrophedonic_bitmap_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_data_apply_boustrophedonic_bitmap_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_apply_boustrophedonic_bitmap_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    int unpack_double_element(grib_accessor*, size_t i, double* val) override;
+    int unpack_double_element_set(grib_accessor*, const size_t* index_array, size_t len, double* val_array) override;
+};
+#endif /* eccodes_accessor_data_apply_boustrophedonic_bitmap_h */
diff --git a/src/accessor/todo/grib_accessor_class_data_ccsds_packing.cc b/src/accessor/grib_accessor_class_data_ccsds_packing.cc
similarity index 77%
rename from src/accessor/todo/grib_accessor_class_data_ccsds_packing.cc
rename to src/accessor/grib_accessor_class_data_ccsds_packing.cc
index ccfd48c03..5158ee7fd 100644
--- a/src/accessor/todo/grib_accessor_class_data_ccsds_packing.cc
+++ b/src/accessor/grib_accessor_class_data_ccsds_packing.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,137 +9,16 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-#include "grib_bits_any_endian_simple.h"
+#include "grib_api_internal.h"
+#include "grib_accessor_class_data_ccsds_packing.h"
 #include "grib_scaling.h"
-#include <cstdint>
-#include <type_traits>
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_values
-   IMPLEMENTS = init
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = unpack_float
-   IMPLEMENTS = pack_double
-   IMPLEMENTS = unpack_double_element;unpack_double_element_set
-   IMPLEMENTS = value_count
-   MEMBERS=const char*   number_of_values
-   MEMBERS=const char*   reference_value
-   MEMBERS=const char*   binary_scale_factor
-   MEMBERS=const char*   decimal_scale_factor
-   MEMBERS=const char*   optimize_scaling_factor
-   MEMBERS=const char*   bits_per_value
-   MEMBERS=const char*   number_of_data_points
-   MEMBERS=const char*   ccsds_flags
-   MEMBERS=const char*   ccsds_block_size
-   MEMBERS=const char*   ccsds_rsi
-
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_float(grib_accessor*, float* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static int unpack_double_element(grib_accessor*, size_t i, double* val);
-static int unpack_double_element_set(grib_accessor*, const size_t* index_array, size_t len, double* val_array);
-
-typedef struct grib_accessor_data_ccsds_packing
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in values */
-    int  carg;
-    const char* seclen;
-    const char* offsetdata;
-    const char* offsetsection;
-    int dirty;
-    /* Members defined in data_ccsds_packing */
-    const char*   number_of_values;
-    const char*   reference_value;
-    const char*   binary_scale_factor;
-    const char*   decimal_scale_factor;
-    const char*   optimize_scaling_factor;
-    const char*   bits_per_value;
-    const char*   number_of_data_points;
-    const char*   ccsds_flags;
-    const char*   ccsds_block_size;
-    const char*   ccsds_rsi;
-} grib_accessor_data_ccsds_packing;
-
-extern grib_accessor_class* grib_accessor_class_values;
-
-static grib_accessor_class _grib_accessor_class_data_ccsds_packing = {
-    &grib_accessor_class_values,                      /* super */
-    "data_ccsds_packing",                      /* name */
-    sizeof(grib_accessor_data_ccsds_packing),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    &unpack_float,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    &unpack_double_element,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    &unpack_double_element_set,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
 
+grib_accessor_class_data_ccsds_packing_t _grib_accessor_class_data_ccsds_packing{"data_ccsds_packing"};
 grib_accessor_class* grib_accessor_class_data_ccsds_packing = &_grib_accessor_class_data_ccsds_packing;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    grib_accessor_data_ccsds_packing* self = (grib_accessor_data_ccsds_packing*)a;
+void grib_accessor_class_data_ccsds_packing_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    grib_accessor_data_ccsds_packing_t* self = (grib_accessor_data_ccsds_packing_t*)a;
     grib_handle* h                         = grib_handle_of_accessor(a);
 
     self->number_of_values        = grib_arguments_get_name(h, args, self->carg++);
@@ -155,9 +35,8 @@ static void init(grib_accessor* a, const long v, grib_arguments* args)
     a->flags |= GRIB_ACCESSOR_FLAG_DATA;
 }
 
-static int value_count(grib_accessor* a, long* count)
-{
-    grib_accessor_data_ccsds_packing* self = (grib_accessor_data_ccsds_packing*)a;
+int grib_accessor_class_data_ccsds_packing_t::value_count(grib_accessor* a, long* count){
+    grib_accessor_data_ccsds_packing_t* self = (grib_accessor_data_ccsds_packing_t*)a;
     *count = 0;
     return grib_get_long_internal(grib_handle_of_accessor(a), self->number_of_values, count);
 }
@@ -177,8 +56,7 @@ static bool is_big_endian()
     return reinterpret_cast<const char*>(&endianess_test)[0] == is_big_endian;
 }
 
-static void modify_aec_flags(long* flags)
-{
+void modify_aec_flags(long* flags){
     // ECC-1602: Performance improvement: enabled the use of native data types
     *flags &= ~AEC_DATA_3BYTE;  // disable support for 3-bytes per value
     if (is_big_endian())
@@ -197,8 +75,7 @@ static const char* aec_get_error_message(int code)
     return "Unknown error code";
 }
 
-static void print_aec_stream_info(struct aec_stream* strm, const char* func)
-{
+void print_aec_stream_info(struct aec_stream* strm, const char* func){
     fprintf(stderr, "ECCODES DEBUG CCSDS %s aec_stream.flags=%u\n",           func, strm->flags);
     fprintf(stderr, "ECCODES DEBUG CCSDS %s aec_stream.bits_per_sample=%u\n", func, strm->bits_per_sample);
     fprintf(stderr, "ECCODES DEBUG CCSDS %s aec_stream.block_size=%u\n",      func, strm->block_size);
@@ -207,9 +84,8 @@ static void print_aec_stream_info(struct aec_stream* strm, const char* func)
     fprintf(stderr, "ECCODES DEBUG CCSDS %s aec_stream.avail_in=%lu\n",       func, strm->avail_in);
 }
 
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_data_ccsds_packing* self = (grib_accessor_data_ccsds_packing*)a;
+int grib_accessor_class_data_ccsds_packing_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_data_ccsds_packing_t* self = (grib_accessor_data_ccsds_packing_t*)a;
 
     grib_handle* hand = grib_handle_of_accessor(a);
     const char* cclass_name = a->cclass->name;
@@ -499,10 +375,9 @@ cleanup:
 }
 
 template <typename T>
-static int unpack(grib_accessor* a, T* val, size_t* len)
-{
+int unpack(grib_accessor* a, T* val, size_t* len){
     static_assert(std::is_floating_point<T>::value, "Requires floating point numbers");
-    grib_accessor_data_ccsds_packing* self = (grib_accessor_data_ccsds_packing*)a;
+    grib_accessor_data_ccsds_packing_t* self = (grib_accessor_data_ccsds_packing_t*)a;
     grib_handle* hand       = grib_handle_of_accessor(a);
     const char* cclass_name = a->cclass->name;
 
@@ -530,7 +405,7 @@ static int unpack(grib_accessor* a, T* val, size_t* len)
 
     self->dirty = 0;
 
-    if ((err = grib_value_count(a, &nn)) != GRIB_SUCCESS)
+    if ((err = a->value_count(&nn)) != GRIB_SUCCESS)
         return err;
     n_vals = nn;
 
@@ -569,10 +444,8 @@ static int unpack(grib_accessor* a, T* val, size_t* len)
     bscale = codes_power<T>(binary_scale_factor, 2);
     dscale = codes_power<T>(-decimal_scale_factor, 10);
 
-    buflen = grib_byte_count(a);
-    buf = (unsigned char*)hand->buffer->data;
-    buf += grib_byte_offset(a);
-
+    buflen = a->byte_count();    buf = (unsigned char*)hand->buffer->data;
+    buf += a->byte_offset();
     strm.flags           = ccsds_flags;
     strm.bits_per_sample = bits_per_value;
     strm.block_size      = ccsds_block_size;
@@ -637,20 +510,17 @@ cleanup:
     return err;
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
+int grib_accessor_class_data_ccsds_packing_t::unpack_double(grib_accessor* a, double* val, size_t* len){
     return unpack<double>(a, val, len);
 }
 
-static int unpack_float(grib_accessor* a, float* val, size_t* len)
-{
+int grib_accessor_class_data_ccsds_packing_t::unpack_float(grib_accessor* a, float* val, size_t* len){
     return unpack<float>(a, val, len);
 }
 
-static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
-{
+int grib_accessor_class_data_ccsds_packing_t::unpack_double_element(grib_accessor* a, size_t idx, double* val){
     // The index idx relates to codedValues NOT values!
-    const grib_accessor_data_ccsds_packing* self = (grib_accessor_data_ccsds_packing*)a;
+    const grib_accessor_data_ccsds_packing_t* self = (grib_accessor_data_ccsds_packing_t*)a;
     grib_handle* hand = grib_handle_of_accessor(a);
     int err = 0;
     size_t size    = 0;
@@ -684,9 +554,8 @@ static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
     return GRIB_SUCCESS;
 }
 
-static int unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array)
-{
-    const grib_accessor_data_ccsds_packing* self = (grib_accessor_data_ccsds_packing*)a;
+int grib_accessor_class_data_ccsds_packing_t::unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array){
+    const grib_accessor_data_ccsds_packing_t* self = (grib_accessor_data_ccsds_packing_t*)a;
     grib_handle* hand = grib_handle_of_accessor(a);
     size_t size = 0, i = 0;
     double* values = NULL;
@@ -732,34 +601,28 @@ static int unpack_double_element_set(grib_accessor* a, const size_t* index_array
 
 #else
 
-static void print_error_feature_not_enabled(grib_context* c)
-{
+static void print_error_feature_not_enabled(grib_context* c){
     grib_context_log(c, GRIB_LOG_ERROR,
                      "CCSDS support not enabled. "
                      "Please rebuild with -DENABLE_AEC=ON (Adaptive Entropy Coding library)");
 }
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
+int grib_accessor_class_data_ccsds_packing_t::pack_double(grib_accessor* a, const double* val, size_t* len){
     print_error_feature_not_enabled(a->context);
     return GRIB_FUNCTIONALITY_NOT_ENABLED;
 }
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
+int grib_accessor_class_data_ccsds_packing_t::unpack_double(grib_accessor* a, double* val, size_t* len){
     print_error_feature_not_enabled(a->context);
     return GRIB_FUNCTIONALITY_NOT_ENABLED;
 }
-static int unpack_float(grib_accessor* a, float* val, size_t* len)
-{
+int grib_accessor_class_data_ccsds_packing_t::unpack_float(grib_accessor* a, float* val, size_t* len){
     print_error_feature_not_enabled(a->context);
     return GRIB_FUNCTIONALITY_NOT_ENABLED;
 }
-static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
-{
+int grib_accessor_class_data_ccsds_packing_t::unpack_double_element(grib_accessor* a, size_t idx, double* val){
     print_error_feature_not_enabled(a->context);
     return GRIB_FUNCTIONALITY_NOT_ENABLED;
 }
-static int unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array)
-{
+int grib_accessor_class_data_ccsds_packing_t::unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array){
     print_error_feature_not_enabled(a->context);
     return GRIB_FUNCTIONALITY_NOT_ENABLED;
 }
diff --git a/src/accessor/grib_accessor_class_data_ccsds_packing.h b/src/accessor/grib_accessor_class_data_ccsds_packing.h
new file mode 100644
index 000000000..2d06c6f09
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_ccsds_packing.h
@@ -0,0 +1,47 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_ccsds_packing_h
+#define eccodes_accessor_data_ccsds_packing_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_values.h"
+
+class grib_accessor_data_ccsds_packing_t : public grib_accessor_values_t
+{
+public:
+    /* Members defined in data_ccsds_packing */
+    const char*   number_of_values;
+    const char*   reference_value;
+    const char*   binary_scale_factor;
+    const char*   decimal_scale_factor;
+    const char*   optimize_scaling_factor;
+    const char*   bits_per_value;
+    const char*   number_of_data_points;
+    const char*   ccsds_flags;
+    const char*   ccsds_block_size;
+    const char*   ccsds_rsi;
+};
+
+class grib_accessor_class_data_ccsds_packing_t : public grib_accessor_class_values_t
+{
+public:
+    grib_accessor_class_data_ccsds_packing_t(const char* name) : grib_accessor_class_values_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_ccsds_packing_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_float(grib_accessor*, float* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    int unpack_double_element(grib_accessor*, size_t i, double* val) override;
+    int unpack_double_element_set(grib_accessor*, const size_t* index_array, size_t len, double* val_array) override;
+};
+#endif /* eccodes_accessor_data_ccsds_packing_h */
diff --git a/src/accessor/todo/grib_accessor_class_data_complex_packing.cc b/src/accessor/grib_accessor_class_data_complex_packing.cc
similarity index 82%
rename from src/accessor/todo/grib_accessor_class_data_complex_packing.cc
rename to src/accessor/grib_accessor_class_data_complex_packing.cc
index 49d312611..e9c36000f 100644
--- a/src/accessor/todo/grib_accessor_class_data_complex_packing.cc
+++ b/src/accessor/grib_accessor_class_data_complex_packing.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,147 +9,20 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-#include "grib_ieeefloat.h"
+#include "grib_api_internal.h"
+#include "grib_accessor_class_data_complex_packing.h"
 #include "grib_scaling.h"
-#include <cmath>
-#include <algorithm>
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_data_simple_packing
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = unpack_float
-   IMPLEMENTS = pack_double
-   IMPLEMENTS = value_count
-   IMPLEMENTS = init
-   MEMBERS= const char*  GRIBEX_sh_bug_present
-   MEMBERS= const char*  ieee_floats
-   MEMBERS= const char*  laplacianOperatorIsSet
-   MEMBERS= const char*  laplacianOperator
-   MEMBERS= const char*  sub_j
-   MEMBERS= const char*  sub_k
-   MEMBERS= const char*  sub_m
-   MEMBERS= const char*  pen_j
-   MEMBERS= const char*  pen_k
-   MEMBERS= const char*  pen_m
-   END_CLASS_DEF
-
- */
-
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_float(grib_accessor*, float* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_data_complex_packing
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in values */
-    int  carg;
-    const char* seclen;
-    const char* offsetdata;
-    const char* offsetsection;
-    int dirty;
-    /* Members defined in data_simple_packing */
-    int edition;
-    const char*  units_factor;
-    const char*  units_bias;
-    const char*  changing_precision;
-    const char*  number_of_values;
-    const char*  bits_per_value;
-    const char*  reference_value;
-    const char*  binary_scale_factor;
-    const char*  decimal_scale_factor;
-    const char*  optimize_scaling_factor;
-    /* Members defined in data_complex_packing */
-    const char*  GRIBEX_sh_bug_present;
-    const char*  ieee_floats;
-    const char*  laplacianOperatorIsSet;
-    const char*  laplacianOperator;
-    const char*  sub_j;
-    const char*  sub_k;
-    const char*  sub_m;
-    const char*  pen_j;
-    const char*  pen_k;
-    const char*  pen_m;
-} grib_accessor_data_complex_packing;
-
-extern grib_accessor_class* grib_accessor_class_data_simple_packing;
-
-static grib_accessor_class _grib_accessor_class_data_complex_packing = {
-    &grib_accessor_class_data_simple_packing,                      /* super */
-    "data_complex_packing",                      /* name */
-    sizeof(grib_accessor_data_complex_packing),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    &unpack_float,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_ieeefloat.h"
 
+grib_accessor_class_data_complex_packing_t _grib_accessor_class_data_complex_packing{"data_complex_packing"};
 grib_accessor_class* grib_accessor_class_data_complex_packing = &_grib_accessor_class_data_complex_packing;
 
-/* END_CLASS_IMP */
 
 typedef unsigned long (*encode_float_proc)(double);
 typedef double (*decode_float_proc)(unsigned long);
 
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    grib_accessor_data_complex_packing* self = (grib_accessor_data_complex_packing*)a;
+void grib_accessor_class_data_complex_packing_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    grib_accessor_data_complex_packing_t* self = (grib_accessor_data_complex_packing_t*)a;
     grib_handle* gh                          = grib_handle_of_accessor(a);
 
     self->GRIBEX_sh_bug_present  = grib_arguments_get_name(gh, args, self->carg++);
@@ -165,9 +39,8 @@ static void init(grib_accessor* a, const long v, grib_arguments* args)
     a->flags |= GRIB_ACCESSOR_FLAG_DATA;
 }
 
-static int value_count(grib_accessor* a, long* count)
-{
-    grib_accessor_data_complex_packing* self = (grib_accessor_data_complex_packing*)a;
+int grib_accessor_class_data_complex_packing_t::value_count(grib_accessor* a, long* count){
+    grib_accessor_data_complex_packing_t* self = (grib_accessor_data_complex_packing_t*)a;
     int ret = 0;
     grib_handle* gh = grib_handle_of_accessor(a);
     long pen_j = 0;
@@ -195,8 +68,7 @@ static int value_count(grib_accessor* a, long* count)
     return ret;
 }
 
-static double calculate_pfactor(const grib_context* ctx, const double* spectralField, long fieldTruncation, long subsetTruncation)
-{
+double calculate_pfactor(const grib_context* ctx, const double* spectralField, long fieldTruncation, long subsetTruncation){
     /*long n_vals = ((fieldTruncation+1)*(fieldTruncation+2));*/
     long loop, index, m, n = 0;
     double pFactor, zeps = 1.0e-15;
@@ -302,9 +174,8 @@ static double calculate_pfactor(const grib_context* ctx, const double* spectralF
     return pFactor;
 }
 
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_data_complex_packing* self = (grib_accessor_data_complex_packing*)a;
+int grib_accessor_class_data_complex_packing_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_data_complex_packing_t* self = (grib_accessor_data_complex_packing_t*)a;
     grib_handle* gh                          = grib_handle_of_accessor(a);
     const char* cclass_name                  = a->cclass->name;
 
@@ -673,10 +544,9 @@ static int pack_double(grib_accessor* a, const double* val, size_t* len)
 
 
 template <typename T>
-static int unpack(grib_accessor* a, T* val, size_t* len)
-{
+int unpack(grib_accessor* a, T* val, size_t* len){
     static_assert(std::is_floating_point<T>::value, "Requires floating point numbers");
-    grib_accessor_data_complex_packing* self = (grib_accessor_data_complex_packing*)a;
+    grib_accessor_data_complex_packing_t* self = (grib_accessor_data_complex_packing_t*)a;
     grib_handle* gh                          = grib_handle_of_accessor(a);
     const char* cclass_name                  = a->cclass->name;
 
@@ -724,8 +594,7 @@ static int unpack(grib_accessor* a, T* val, size_t* len)
 
     decode_float_proc decode_float = NULL;
 
-    err = grib_value_count(a, &n_vals);
-    if (err)
+    err = a->value_count(&n_vals);    if (err)
         return err;
 
     if (*len < n_vals) {
@@ -798,8 +667,7 @@ static int unpack(grib_accessor* a, T* val, size_t* len)
 
     maxv = pen_j + 1;
 
-    buf += grib_byte_offset(a);
-    hres = buf;
+    buf += a->byte_offset();    hres = buf;
     lres = buf;
 
     if (pen_j == sub_j) {
@@ -814,8 +682,7 @@ static int unpack(grib_accessor* a, T* val, size_t* len)
         return 0;
     }
 
-    packed_offset = grib_byte_offset(a) + bytes * (sub_k + 1) * (sub_k + 2);
-
+    packed_offset = a->byte_offset() + bytes * (sub_k + 1) * (sub_k + 2);
     lpos = 8 * (packed_offset - offsetdata);
 
     s = codes_power<T>(binary_scale_factor, 2);
@@ -895,13 +762,11 @@ static int unpack(grib_accessor* a, T* val, size_t* len)
     return ret;
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
+int grib_accessor_class_data_complex_packing_t::unpack_double(grib_accessor* a, double* val, size_t* len){
     return unpack<double>(a, val, len);
 }
 
-static int unpack_float(grib_accessor* a, float* val, size_t* len)
-{
+int grib_accessor_class_data_complex_packing_t::unpack_float(grib_accessor* a, float* val, size_t* len){
     // TODO(maee): See ECC-1579
     // Investigate why results are not bit-identical
 
diff --git a/src/accessor/grib_accessor_class_data_complex_packing.h b/src/accessor/grib_accessor_class_data_complex_packing.h
new file mode 100644
index 000000000..2c4618865
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_complex_packing.h
@@ -0,0 +1,45 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_complex_packing_h
+#define eccodes_accessor_data_complex_packing_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_data_simple_packing.h"
+
+class grib_accessor_data_complex_packing_t : public grib_accessor_data_simple_packing_t
+{
+public:
+    /* Members defined in data_complex_packing */
+    const char*  GRIBEX_sh_bug_present;
+    const char*  ieee_floats;
+    const char*  laplacianOperatorIsSet;
+    const char*  laplacianOperator;
+    const char*  sub_j;
+    const char*  sub_k;
+    const char*  sub_m;
+    const char*  pen_j;
+    const char*  pen_k;
+    const char*  pen_m;
+};
+
+class grib_accessor_class_data_complex_packing_t : public grib_accessor_class_data_simple_packing_t
+{
+public:
+    grib_accessor_class_data_complex_packing_t(const char* name) : grib_accessor_class_data_simple_packing_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_complex_packing_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_float(grib_accessor*, float* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_data_complex_packing_h */
diff --git a/src/accessor/grib_accessor_class_data_dummy_field.cc b/src/accessor/grib_accessor_class_data_dummy_field.cc
new file mode 100644
index 000000000..5216c2a94
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_dummy_field.cc
@@ -0,0 +1,102 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_data_dummy_field.h"
+
+grib_accessor_class_data_dummy_field_t _grib_accessor_class_data_dummy_field{"data_dummy_field"};
+grib_accessor_class* grib_accessor_class_data_dummy_field = &_grib_accessor_class_data_dummy_field;
+
+
+void grib_accessor_class_data_dummy_field_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    grib_accessor_data_dummy_field_t* self = (grib_accessor_data_dummy_field_t*)a;
+    self->missing_value  = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
+    self->numberOfPoints = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
+    self->bitmap         = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
+}
+
+int grib_accessor_class_data_dummy_field_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_data_dummy_field_t* self = (grib_accessor_data_dummy_field_t*)a;
+    size_t i = 0, n_vals = 0;
+    long numberOfPoints;
+    double missing_value = 0;
+    int err = 0;
+
+    if ((err = grib_get_long_internal(grib_handle_of_accessor(a), self->numberOfPoints, &numberOfPoints)) != GRIB_SUCCESS)
+        return err;
+    n_vals = numberOfPoints;
+
+    if ((err = grib_get_double_internal(grib_handle_of_accessor(a), self->missing_value, &missing_value)) != GRIB_SUCCESS)
+        return err;
+
+    if (*len < n_vals) {
+        *len = n_vals;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    for (i = 0; i < n_vals; i++)
+        val[i] = missing_value;
+
+    if (grib_find_accessor(grib_handle_of_accessor(a), self->bitmap)) {
+        if ((err = grib_set_double_array_internal(grib_handle_of_accessor(a), self->bitmap, val, n_vals)) != GRIB_SUCCESS)
+            return err;
+    }
+
+    *len = (long)n_vals;
+    return err;
+}
+
+int grib_accessor_class_data_dummy_field_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_data_dummy_field_t* self = (grib_accessor_data_dummy_field_t*)a;
+
+    size_t n_vals = *len;
+    int err       = 0;
+    long bits_per_value = 0;
+    long half_byte = 0;
+    size_t buflen  = 0;
+    unsigned char* buf = NULL;
+
+    if (*len == 0)
+        return GRIB_NO_VALUES;
+
+    if ((err = grib_get_long_internal(grib_handle_of_accessor(a), self->bits_per_value, &bits_per_value)) != GRIB_SUCCESS)
+        return err;
+
+    buflen = (1 + ((bits_per_value * n_vals) / 8)) * sizeof(unsigned char);
+
+    buf = (unsigned char*)grib_context_malloc_clear(a->context, buflen);
+    if (!buf)
+        return GRIB_OUT_OF_MEMORY;
+
+    half_byte = (buflen * 8) - ((*len) * bits_per_value);
+
+    if ((err = grib_set_long_internal(grib_handle_of_accessor(a), self->half_byte, half_byte)) != GRIB_SUCCESS) {
+        grib_context_free(a->context, buf);
+        return err;
+    }
+    grib_buffer_replace(a, buf, buflen, 1, 1);
+
+    grib_context_free(a->context, buf);
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_data_dummy_field_t::value_count(grib_accessor* a, long* numberOfPoints){
+    grib_accessor_data_dummy_field_t* self = (grib_accessor_data_dummy_field_t*)a;
+    int err = 0;
+    *numberOfPoints = 0;
+
+    if ((err = grib_get_long_internal(grib_handle_of_accessor(a), self->numberOfPoints, numberOfPoints)) != GRIB_SUCCESS) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "Unable to get count of %s (%s)", a->name, grib_get_error_message(err));
+    }
+
+    return err;
+}
diff --git a/src/accessor/grib_accessor_class_data_dummy_field.h b/src/accessor/grib_accessor_class_data_dummy_field.h
new file mode 100644
index 000000000..00de1fe73
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_dummy_field.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_dummy_field_h
+#define eccodes_accessor_data_dummy_field_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_data_g1simple_packing.h"
+
+class grib_accessor_data_dummy_field_t : public grib_accessor_data_g1simple_packing_t
+{
+public:
+    /* Members defined in data_dummy_field */
+    const char*  missing_value;
+    const char*  numberOfPoints;
+    const char*  bitmap;
+};
+
+class grib_accessor_class_data_dummy_field_t : public grib_accessor_class_data_g1simple_packing_t
+{
+public:
+    grib_accessor_class_data_dummy_field_t(const char* name) : grib_accessor_class_data_g1simple_packing_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_dummy_field_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_data_dummy_field_h */
diff --git a/src/accessor/grib_accessor_class_data_g1complex_packing.cc b/src/accessor/grib_accessor_class_data_g1complex_packing.cc
new file mode 100644
index 000000000..eecf83cfb
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_g1complex_packing.cc
@@ -0,0 +1,112 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_data_g1complex_packing.h"
+
+grib_accessor_class_data_g1complex_packing_t _grib_accessor_class_data_g1complex_packing{"data_g1complex_packing"};
+grib_accessor_class* grib_accessor_class_data_g1complex_packing = &_grib_accessor_class_data_g1complex_packing;
+
+
+void grib_accessor_class_data_g1complex_packing_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    grib_accessor_data_g1complex_packing_t* self = (grib_accessor_data_g1complex_packing_t*)a;
+    self->half_byte                            = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
+    self->N                                    = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
+    self->packingType                          = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
+    self->ieee_packing                         = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
+    self->precision                            = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
+    self->edition                              = 1;
+    a->flags |= GRIB_ACCESSOR_FLAG_DATA;
+}
+
+int grib_accessor_class_data_g1complex_packing_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_data_g1complex_packing_t* self = (grib_accessor_data_g1complex_packing_t*)a;
+    int ret              = GRIB_SUCCESS;
+    long seclen          = 0;
+    long sub_j           = 0;
+    long sub_k           = 0;
+    long sub_m           = 0;
+    long n               = 0;
+    long half_byte       = 0;
+    long bits_per_value  = 0;
+    size_t buflen        = 0;
+
+    if (*len == 0)
+        return GRIB_NO_VALUES;
+
+//     /* TODO: spectral_ieee does not work */
+//     if (c->ieee_packing && self->ieee_packing) {
+//         grib_handle* h       = grib_handle_of_accessor(a);
+//         grib_context* c      = a->context;
+//         char* packingType_s  = NULL;
+//         char* ieee_packing_s = NULL;
+//         long precision = c->ieee_packing == 32 ? 1 : 2;
+//         size_t lenstr  = strlen(self->ieee_packing);
+
+//         packingType_s  = grib_context_strdup(c, self->packingType);
+//         ieee_packing_s = grib_context_strdup(c, self->ieee_packing);
+//         precision_s    = grib_context_strdup(c, self->precision);
+
+//         grib_set_string(h, packingType_s, ieee_packing_s, &lenstr);
+//         grib_set_long(h, precision_s, precision);
+
+//         grib_context_free(c, packingType_s);
+//         grib_context_free(c, ieee_packing_s);
+//         grib_context_free(c, precision_s);
+//         return grib_set_double_array(h, "values", val, *len);
+//     }
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->sub_j, &sub_j)) != GRIB_SUCCESS)
+        return ret;
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->sub_k, &sub_k)) != GRIB_SUCCESS)
+        return ret;
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->sub_m, &sub_m)) != GRIB_SUCCESS)
+        return ret;
+
+    self->dirty = 1;
+
+    Assert((sub_j == sub_k) && (sub_m == sub_j));
+
+    ret = grib_accessor_class_data_complex_packing_t::pack_double(a, val, len);
+
+    if (ret == GRIB_SUCCESS) {
+        n = a->offset + 4 * ((sub_k + 1) * (sub_k + 2));
+
+        /*     Octet number starts from beginning of message but shouldn't     */
+        if ((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->N, n)) != GRIB_SUCCESS)
+            return ret;
+
+        // ret = grib_get_long_internal(grib_handle_of_accessor(a), self->offsetsection, &offsetsection);
+        // if (ret != GRIB_SUCCESS)
+        //     return ret;
+        // if ((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->N, n - offsetsection)) != GRIB_SUCCESS)
+        //     return ret;
+
+        ret = grib_get_long_internal(grib_handle_of_accessor(a), self->bits_per_value, &bits_per_value);
+        if (ret != GRIB_SUCCESS)
+            return ret;
+
+        ret = grib_get_long_internal(grib_handle_of_accessor(a), self->seclen, &seclen);
+        if (ret != GRIB_SUCCESS)
+            return ret;
+
+        buflen    = 32 * (sub_k + 1) * (sub_k + 2) + (*len - (sub_k + 1) * (sub_k + 2)) * bits_per_value + 18 * 8;
+        half_byte = seclen * 8 - buflen;
+        if (a->context->debug == -1) {
+            fprintf(stderr, "ECCODES DEBUG: half_byte=%ld\n", half_byte);
+        }
+
+        ret = grib_set_long_internal(grib_handle_of_accessor(a), self->half_byte, half_byte);
+        if (ret != GRIB_SUCCESS)
+            return ret;
+    }
+    return ret;
+}
diff --git a/src/accessor/grib_accessor_class_data_g1complex_packing.h b/src/accessor/grib_accessor_class_data_g1complex_packing.h
new file mode 100644
index 000000000..cc6208c95
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_g1complex_packing.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_g1complex_packing_h
+#define eccodes_accessor_data_g1complex_packing_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_data_complex_packing.h"
+
+class grib_accessor_data_g1complex_packing_t : public grib_accessor_data_complex_packing_t
+{
+public:
+    /* Members defined in data_g1complex_packing */
+    const char*  N;
+    const char*  half_byte;
+    const char*  packingType;
+    const char*  ieee_packing;
+    const char*  precision;
+};
+
+class grib_accessor_class_data_g1complex_packing_t : public grib_accessor_class_data_complex_packing_t
+{
+public:
+    grib_accessor_class_data_g1complex_packing_t(const char* name) : grib_accessor_class_data_complex_packing_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_g1complex_packing_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_data_g1complex_packing_h */
diff --git a/src/accessor/todo/grib_accessor_class_data_g1second_order_constant_width_packing.cc b/src/accessor/grib_accessor_class_data_g1second_order_constant_width_packing.cc
similarity index 58%
rename from src/accessor/todo/grib_accessor_class_data_g1second_order_constant_width_packing.cc
rename to src/accessor/grib_accessor_class_data_g1second_order_constant_width_packing.cc
index 079e91829..b0009cfa9 100644
--- a/src/accessor/todo/grib_accessor_class_data_g1second_order_constant_width_packing.cc
+++ b/src/accessor/grib_accessor_class_data_g1second_order_constant_width_packing.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,157 +9,16 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-#include "grib_scaling.h"
 #include "grib_api_internal.h"
+#include "grib_accessor_class_data_g1second_order_constant_width_packing.h"
+#include "grib_scaling.h"
 
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_data_simple_packing
-   IMPLEMENTS = init
-   IMPLEMENTS = pack_double
-   IMPLEMENTS = unpack_double;unpack_float
-   IMPLEMENTS = unpack_double_element;unpack_double_element_set
-   IMPLEMENTS = value_count
-   MEMBERS=const char* half_byte
-   MEMBERS=const char* packingType
-   MEMBERS=const char* ieee_packing
-   MEMBERS=const char* precision
-   MEMBERS=const char* widthOfFirstOrderValues
-   MEMBERS=const char* N1
-   MEMBERS=const char* N2
-   MEMBERS=const char* numberOfGroups
-   MEMBERS=const char* numberOfSecondOrderPackedValues
-   MEMBERS=const char* extraValues
-   MEMBERS=const char* pl
-   MEMBERS=const char* Ni
-   MEMBERS=const char* Nj
-   MEMBERS=const char* jPointsAreConsecutive
-   MEMBERS=const char* bitmap
-   MEMBERS=const char* groupWidth
-
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_float(grib_accessor*, float* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static int unpack_double_element(grib_accessor*, size_t i, double* val);
-static int unpack_double_element_set(grib_accessor*, const size_t* index_array, size_t len, double* val_array);
-
-typedef struct grib_accessor_data_g1second_order_constant_width_packing
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in values */
-    int  carg;
-    const char* seclen;
-    const char* offsetdata;
-    const char* offsetsection;
-    int dirty;
-    /* Members defined in data_simple_packing */
-    int edition;
-    const char*  units_factor;
-    const char*  units_bias;
-    const char*  changing_precision;
-    const char*  number_of_values;
-    const char*  bits_per_value;
-    const char*  reference_value;
-    const char*  binary_scale_factor;
-    const char*  decimal_scale_factor;
-    const char*  optimize_scaling_factor;
-    /* Members defined in data_g1second_order_constant_width_packing */
-    const char* half_byte;
-    const char* packingType;
-    const char* ieee_packing;
-    const char* precision;
-    const char* widthOfFirstOrderValues;
-    const char* N1;
-    const char* N2;
-    const char* numberOfGroups;
-    const char* numberOfSecondOrderPackedValues;
-    const char* extraValues;
-    const char* pl;
-    const char* Ni;
-    const char* Nj;
-    const char* jPointsAreConsecutive;
-    const char* bitmap;
-    const char* groupWidth;
-} grib_accessor_data_g1second_order_constant_width_packing;
-
-extern grib_accessor_class* grib_accessor_class_data_simple_packing;
-
-static grib_accessor_class _grib_accessor_class_data_g1second_order_constant_width_packing = {
-    &grib_accessor_class_data_simple_packing,                      /* super */
-    "data_g1second_order_constant_width_packing",                      /* name */
-    sizeof(grib_accessor_data_g1second_order_constant_width_packing),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    &unpack_float,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    &unpack_double_element,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    &unpack_double_element_set,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
+grib_accessor_class_data_g1second_order_constant_width_packing_t _grib_accessor_class_data_g1second_order_constant_width_packing{"data_g1second_order_constant_width_packing"};
 grib_accessor_class* grib_accessor_class_data_g1second_order_constant_width_packing = &_grib_accessor_class_data_g1second_order_constant_width_packing;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    grib_accessor_data_g1second_order_constant_width_packing* self = (grib_accessor_data_g1second_order_constant_width_packing*)a;
+void grib_accessor_class_data_g1second_order_constant_width_packing_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    grib_accessor_data_g1second_order_constant_width_packing_t* self = (grib_accessor_data_g1second_order_constant_width_packing_t*)a;
     grib_handle* hand                    = grib_handle_of_accessor(a);
 
     self->half_byte                       = grib_arguments_get_name(hand, args, self->carg++);
@@ -181,10 +41,9 @@ static void init(grib_accessor* a, const long v, grib_arguments* args)
     a->flags |= GRIB_ACCESSOR_FLAG_DATA;
 }
 
-static int value_count(grib_accessor* a, long* numberOfSecondOrderPackedValues)
-{
+int grib_accessor_class_data_g1second_order_constant_width_packing_t::value_count(grib_accessor* a, long* numberOfSecondOrderPackedValues){
     int err                                                        = 0;
-    grib_accessor_data_g1second_order_constant_width_packing* self = (grib_accessor_data_g1second_order_constant_width_packing*)a;
+    grib_accessor_data_g1second_order_constant_width_packing_t* self = (grib_accessor_data_g1second_order_constant_width_packing_t*)a;
     *numberOfSecondOrderPackedValues                               = 0;
 
     err = grib_get_long_internal(grib_handle_of_accessor(a), self->numberOfSecondOrderPackedValues, numberOfSecondOrderPackedValues);
@@ -192,14 +51,12 @@ static int value_count(grib_accessor* a, long* numberOfSecondOrderPackedValues)
     return err;
 }
 
-static int unpack_float(grib_accessor*, float* val, size_t* len)
-{
+int grib_accessor_class_data_g1second_order_constant_width_packing_t::unpack_float(grib_accessor*, float* val, size_t* len){
     return GRIB_NOT_IMPLEMENTED;
 }
 
-static int unpack_double(grib_accessor* a, double* values, size_t* len)
-{
-    grib_accessor_data_g1second_order_constant_width_packing* self = (grib_accessor_data_g1second_order_constant_width_packing*)a;
+int grib_accessor_class_data_g1second_order_constant_width_packing_t::unpack_double(grib_accessor* a, double* values, size_t* len){
+    grib_accessor_data_g1second_order_constant_width_packing_t* self = (grib_accessor_data_g1second_order_constant_width_packing_t*)a;
     int ret                                                        = 0;
     long numberOfGroups, numberOfSecondOrderPackedValues;
     long groupWidth              = 0;
@@ -218,8 +75,7 @@ static int unpack_double(grib_accessor* a, double* values, size_t* len)
     long* secondaryBitmap;
     grib_handle* hand = grib_handle_of_accessor(a);
 
-    buf += grib_byte_offset(a);
-
+    buf += a->byte_offset();
     if ((ret = grib_get_long_internal(hand, self->numberOfGroups, &numberOfGroups)) != GRIB_SUCCESS)
         return ret;
 
@@ -321,15 +177,13 @@ static int unpack_double(grib_accessor* a, double* values, size_t* len)
     return ret;
 }
 
-static int pack_double(grib_accessor* a, const double* cval, size_t* len)
-{
+int grib_accessor_class_data_g1second_order_constant_width_packing_t::pack_double(grib_accessor* a, const double* cval, size_t* len){
     const char* cclass_name = a->cclass->name;
     grib_context_log(a->context, GRIB_LOG_ERROR, "%s: %s: Not implemented", cclass_name, __func__);
     return GRIB_NOT_IMPLEMENTED;
 }
 
-static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
-{
+int grib_accessor_class_data_g1second_order_constant_width_packing_t::unpack_double_element(grib_accessor* a, size_t idx, double* val){
     grib_handle* hand = grib_handle_of_accessor(a);
     size_t size = 0;
     double* values = NULL;
@@ -354,8 +208,7 @@ static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
     return GRIB_SUCCESS;
 }
 
-static int unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array)
-{
+int grib_accessor_class_data_g1second_order_constant_width_packing_t::unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array){
     grib_handle* hand = grib_handle_of_accessor(a);
     size_t size = 0, i = 0;
     double* values = NULL;
diff --git a/src/accessor/grib_accessor_class_data_g1second_order_constant_width_packing.h b/src/accessor/grib_accessor_class_data_g1second_order_constant_width_packing.h
new file mode 100644
index 000000000..adfc36716
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_g1second_order_constant_width_packing.h
@@ -0,0 +1,53 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_g1second_order_constant_width_packing_h
+#define eccodes_accessor_data_g1second_order_constant_width_packing_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_data_simple_packing.h"
+
+class grib_accessor_data_g1second_order_constant_width_packing_t : public grib_accessor_data_simple_packing_t
+{
+public:
+    /* Members defined in data_g1second_order_constant_width_packing */
+    const char* half_byte;
+    const char* packingType;
+    const char* ieee_packing;
+    const char* precision;
+    const char* widthOfFirstOrderValues;
+    const char* N1;
+    const char* N2;
+    const char* numberOfGroups;
+    const char* numberOfSecondOrderPackedValues;
+    const char* extraValues;
+    const char* pl;
+    const char* Ni;
+    const char* Nj;
+    const char* jPointsAreConsecutive;
+    const char* bitmap;
+    const char* groupWidth;
+};
+
+class grib_accessor_class_data_g1second_order_constant_width_packing_t : public grib_accessor_class_data_simple_packing_t
+{
+public:
+    grib_accessor_class_data_g1second_order_constant_width_packing_t(const char* name) : grib_accessor_class_data_simple_packing_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_g1second_order_constant_width_packing_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_float(grib_accessor*, float* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    int unpack_double_element(grib_accessor*, size_t i, double* val) override;
+    int unpack_double_element_set(grib_accessor*, const size_t* index_array, size_t len, double* val_array) override;
+};
+#endif /* eccodes_accessor_data_g1second_order_constant_width_packing_h */
diff --git a/src/accessor/todo/grib_accessor_class_data_g1second_order_general_extended_packing.cc b/src/accessor/grib_accessor_class_data_g1second_order_general_extended_packing.cc
similarity index 85%
rename from src/accessor/todo/grib_accessor_class_data_g1second_order_general_extended_packing.cc
rename to src/accessor/grib_accessor_class_data_g1second_order_general_extended_packing.cc
index d337dba48..5058a2102 100644
--- a/src/accessor/todo/grib_accessor_class_data_g1second_order_general_extended_packing.cc
+++ b/src/accessor/grib_accessor_class_data_g1second_order_general_extended_packing.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,178 +9,13 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-#include "grib_scaling.h"
 #include "grib_api_internal.h"
-#include "grib_optimize_decimal_factor.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_data_simple_packing
-   IMPLEMENTS = init
-   IMPLEMENTS = pack_double
-   IMPLEMENTS = unpack_double;unpack_float
-   IMPLEMENTS = unpack_double_element;unpack_double_element_set
-   IMPLEMENTS = value_count
-   IMPLEMENTS = destroy
-   MEMBERS=const char* half_byte
-   MEMBERS=const char* packingType
-   MEMBERS=const char* ieee_packing
-   MEMBERS=const char* precision
-   MEMBERS=const char* widthOfFirstOrderValues
-   MEMBERS=const char* firstOrderValues
-   MEMBERS=const char* N1
-   MEMBERS=const char* N2
-   MEMBERS=const char* numberOfGroups
-   MEMBERS=const char* codedNumberOfGroups
-   MEMBERS=const char* numberOfSecondOrderPackedValues
-   MEMBERS=const char* extraValues
-   MEMBERS=const char* groupWidths
-   MEMBERS=const char* widthOfWidths
-   MEMBERS=const char* groupLengths
-   MEMBERS=const char* widthOfLengths
-   MEMBERS=const char* NL
-   MEMBERS=const char* SPD
-   MEMBERS=const char* widthOfSPD
-   MEMBERS=const char* orderOfSPD
-   MEMBERS=const char* numberOfPoints
-   MEMBERS=const char* dataFlag
-   MEMBERS=double* dvalues
-   MEMBERS=float* fvalues
-   MEMBERS=int double_dirty
-   MEMBERS=int float_dirty
-   MEMBERS=size_t size
-
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_float(grib_accessor*, float* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void destroy(grib_context*, grib_accessor*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static int unpack_double_element(grib_accessor*, size_t i, double* val);
-static int unpack_double_element_set(grib_accessor*, const size_t* index_array, size_t len, double* val_array);
-
-typedef struct grib_accessor_data_g1second_order_general_extended_packing
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in values */
-    int  carg;
-    const char* seclen;
-    const char* offsetdata;
-    const char* offsetsection;
-    int dirty;
-    /* Members defined in data_simple_packing */
-    int edition;
-    const char*  units_factor;
-    const char*  units_bias;
-    const char*  changing_precision;
-    const char*  number_of_values;
-    const char*  bits_per_value;
-    const char*  reference_value;
-    const char*  binary_scale_factor;
-    const char*  decimal_scale_factor;
-    const char*  optimize_scaling_factor;
-    /* Members defined in data_g1second_order_general_extended_packing */
-    const char* half_byte;
-    const char* packingType;
-    const char* ieee_packing;
-    const char* precision;
-    const char* widthOfFirstOrderValues;
-    const char* firstOrderValues;
-    const char* N1;
-    const char* N2;
-    const char* numberOfGroups;
-    const char* codedNumberOfGroups;
-    const char* numberOfSecondOrderPackedValues;
-    const char* extraValues;
-    const char* groupWidths;
-    const char* widthOfWidths;
-    const char* groupLengths;
-    const char* widthOfLengths;
-    const char* NL;
-    const char* SPD;
-    const char* widthOfSPD;
-    const char* orderOfSPD;
-    const char* numberOfPoints;
-    const char* dataFlag;
-    double* dvalues;
-    float* fvalues;
-    int double_dirty;
-    int float_dirty;
-    size_t size;
-} grib_accessor_data_g1second_order_general_extended_packing;
-
-extern grib_accessor_class* grib_accessor_class_data_simple_packing;
-
-static grib_accessor_class _grib_accessor_class_data_g1second_order_general_extended_packing = {
-    &grib_accessor_class_data_simple_packing,                      /* super */
-    "data_g1second_order_general_extended_packing",                      /* name */
-    sizeof(grib_accessor_data_g1second_order_general_extended_packing),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    &destroy,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    &unpack_float,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    &unpack_double_element,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    &unpack_double_element_set,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_data_g1second_order_general_extended_packing.h"
+#include "grib_scaling.h"
 
+grib_accessor_class_data_g1second_order_general_extended_packing_t _grib_accessor_class_data_g1second_order_general_extended_packing{"data_g1second_order_general_extended_packing"};
 grib_accessor_class* grib_accessor_class_data_g1second_order_general_extended_packing = &_grib_accessor_class_data_g1second_order_general_extended_packing;
 
-/* END_CLASS_IMP */
 
 #define MAX_NUMBER_OF_GROUPS 65534
 #define EFDEBUG 0
@@ -203,8 +39,7 @@ static const unsigned long nbits[64] = {
     0x1000000000000000, 0x2000000000000000, 0x4000000000000000, 0x8000000000000000
 };
 
-static long number_of_bits(grib_handle* h, unsigned long x)
-{
+long number_of_bits(grib_handle* h, unsigned long x){
     const unsigned long* n = nbits;
     const int count        = sizeof(nbits) / sizeof(nbits[0]);
     long i                 = 0;
@@ -220,9 +55,8 @@ static long number_of_bits(grib_handle* h, unsigned long x)
     return i;
 }
 
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    grib_accessor_data_g1second_order_general_extended_packing* self = (grib_accessor_data_g1second_order_general_extended_packing*)a;
+void grib_accessor_class_data_g1second_order_general_extended_packing_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    grib_accessor_data_g1second_order_general_extended_packing_t* self = (grib_accessor_data_g1second_order_general_extended_packing_t*)a;
     grib_handle* handle                                              = grib_handle_of_accessor(a);
 
     self->half_byte                       = grib_arguments_get_name(handle, args, self->carg++);
@@ -256,9 +90,8 @@ static void init(grib_accessor* a, const long v, grib_arguments* args)
     a->flags |= GRIB_ACCESSOR_FLAG_DATA;
 }
 
-static int value_count(grib_accessor* a, long* count)
-{
-    grib_accessor_data_g1second_order_general_extended_packing* self = (grib_accessor_data_g1second_order_general_extended_packing*)a;
+int grib_accessor_class_data_g1second_order_general_extended_packing_t::value_count(grib_accessor* a, long* count){
+    grib_accessor_data_g1second_order_general_extended_packing_t* self = (grib_accessor_data_g1second_order_general_extended_packing_t*)a;
     long numberOfCodedValues                                         = 0;
     long numberOfGroups                                              = 0;
     size_t ngroups;
@@ -293,8 +126,7 @@ static int value_count(grib_accessor* a, long* count)
     return err;
 }
 
-static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
-{
+int grib_accessor_class_data_g1second_order_general_extended_packing_t::unpack_double_element(grib_accessor* a, size_t idx, double* val){
     size_t size;
     double* values;
     int err = 0;
@@ -317,8 +149,7 @@ static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
     return GRIB_SUCCESS;
 }
 
-static int unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array)
-{
+int grib_accessor_class_data_g1second_order_general_extended_packing_t::unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array){
     size_t size = 0, i = 0;
     double* values;
     int err = 0;
@@ -345,9 +176,8 @@ static int unpack_double_element_set(grib_accessor* a, const size_t* index_array
     return GRIB_SUCCESS;
 }
 
-static int unpack(grib_accessor* a, double* dvalues, float* fvalues, size_t* len)
-{
-    grib_accessor_data_g1second_order_general_extended_packing* self = (grib_accessor_data_g1second_order_general_extended_packing*)a;
+int unpack(grib_accessor* a, double* dvalues, float* fvalues, size_t* len){
+    grib_accessor_data_g1second_order_general_extended_packing_t* self = (grib_accessor_data_g1second_order_general_extended_packing_t*)a;
     int ret = 0;
     long numberOfGroups, numberOfSecondOrderPackedValues;
     long* firstOrderValues = 0;
@@ -396,8 +226,9 @@ static int unpack(grib_accessor* a, double* dvalues, float* fvalues, size_t* len
         self->float_dirty = 0;
     }
 
-    buf += grib_byte_offset(a);
-    ret = value_count(a, &numberOfValues);
+    buf += a->byte_offset();
+    ret = a->value_count(&numberOfValues);
+
     if (ret)
         return ret;
 
@@ -565,13 +396,11 @@ static int unpack(grib_accessor* a, double* dvalues, float* fvalues, size_t* len
     return ret;
 }
 
-static int unpack_float(grib_accessor* a, float* values, size_t* len)
-{
+int grib_accessor_class_data_g1second_order_general_extended_packing_t::unpack_float(grib_accessor* a, float* values, size_t* len){
     return unpack(a, NULL, values, len);
 }
 
-static int unpack_double(grib_accessor* a, double* values, size_t* len)
-{
+int grib_accessor_class_data_g1second_order_general_extended_packing_t::unpack_double(grib_accessor* a, double* values, size_t* len){
     return unpack(a, values, NULL, len);
 }
 
@@ -684,8 +513,7 @@ static void grib_split_long_groups(grib_handle* hand, grib_context* c, long* num
     grib_context_free(c, localFirstOrderValues);
 }
 
-static int get_bits_per_value(grib_handle* h, const char* bits_per_value_str, long* bits_per_value)
-{
+int get_bits_per_value(grib_handle* h, const char* bits_per_value_str, long* bits_per_value){
     int err = 0;
     if ((err = grib_get_long_internal(h, bits_per_value_str, bits_per_value)) != GRIB_SUCCESS)
         return err;
@@ -708,9 +536,8 @@ static int get_bits_per_value(grib_handle* h, const char* bits_per_value_str, lo
 // For the old implementation of pack_double, see
 //  src/deprecated/grib_accessor_class_data_g1second_order_general_extended_packing.pack_double.cc
 // See ECC-441 and ECC-261
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_data_g1second_order_general_extended_packing* self = (grib_accessor_data_g1second_order_general_extended_packing*)a;
+int grib_accessor_class_data_g1second_order_general_extended_packing_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_data_g1second_order_general_extended_packing_t* self = (grib_accessor_data_g1second_order_general_extended_packing_t*)a;
     int ret                                                          = 0;
     int grib2                                                        = 0;
     long bits_per_value, orderOfSPD, binary_scale_factor;
@@ -1365,9 +1192,8 @@ static int pack_double(grib_accessor* a, const double* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static void destroy(grib_context* context, grib_accessor* a)
-{
-    grib_accessor_data_g1second_order_general_extended_packing* self = (grib_accessor_data_g1second_order_general_extended_packing*)a;
+void grib_accessor_class_data_g1second_order_general_extended_packing_t::destroy(grib_context* context, grib_accessor* a){
+    grib_accessor_data_g1second_order_general_extended_packing_t* self = (grib_accessor_data_g1second_order_general_extended_packing_t*)a;
     if (self->dvalues != NULL) {
         grib_context_free(context, self->dvalues);
         self->dvalues = NULL;
diff --git a/src/accessor/grib_accessor_class_data_g1second_order_general_extended_packing.h b/src/accessor/grib_accessor_class_data_g1second_order_general_extended_packing.h
new file mode 100644
index 000000000..a870edcf6
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_g1second_order_general_extended_packing.h
@@ -0,0 +1,65 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_g1second_order_general_extended_packing_h
+#define eccodes_accessor_data_g1second_order_general_extended_packing_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_data_simple_packing.h"
+
+class grib_accessor_data_g1second_order_general_extended_packing_t : public grib_accessor_data_simple_packing_t
+{
+public:
+    /* Members defined in data_g1second_order_general_extended_packing */
+    const char* half_byte;
+    const char* packingType;
+    const char* ieee_packing;
+    const char* precision;
+    const char* widthOfFirstOrderValues;
+    const char* firstOrderValues;
+    const char* N1;
+    const char* N2;
+    const char* numberOfGroups;
+    const char* codedNumberOfGroups;
+    const char* numberOfSecondOrderPackedValues;
+    const char* extraValues;
+    const char* groupWidths;
+    const char* widthOfWidths;
+    const char* groupLengths;
+    const char* widthOfLengths;
+    const char* NL;
+    const char* SPD;
+    const char* widthOfSPD;
+    const char* orderOfSPD;
+    const char* numberOfPoints;
+    const char* dataFlag;
+    double* dvalues;
+    float* fvalues;
+    int double_dirty;
+    int float_dirty;
+    size_t size;
+};
+
+class grib_accessor_class_data_g1second_order_general_extended_packing_t : public grib_accessor_class_data_simple_packing_t
+{
+public:
+    grib_accessor_class_data_g1second_order_general_extended_packing_t(const char* name) : grib_accessor_class_data_simple_packing_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_g1second_order_general_extended_packing_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_float(grib_accessor*, float* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void destroy(grib_context*, grib_accessor*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    int unpack_double_element(grib_accessor*, size_t i, double* val) override;
+    int unpack_double_element_set(grib_accessor*, const size_t* index_array, size_t len, double* val_array) override;
+};
+#endif /* eccodes_accessor_data_g1second_order_general_extended_packing_h */
diff --git a/src/accessor/todo/grib_accessor_class_data_g1second_order_general_packing.cc b/src/accessor/grib_accessor_class_data_g1second_order_general_packing.cc
similarity index 55%
rename from src/accessor/todo/grib_accessor_class_data_g1second_order_general_packing.cc
rename to src/accessor/grib_accessor_class_data_g1second_order_general_packing.cc
index 3e41fd3e0..e9d620f52 100644
--- a/src/accessor/todo/grib_accessor_class_data_g1second_order_general_packing.cc
+++ b/src/accessor/grib_accessor_class_data_g1second_order_general_packing.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,156 +9,16 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-#include "grib_scaling.h"
 #include "grib_api_internal.h"
-#include <type_traits>
-
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_data_simple_packing
-   IMPLEMENTS = init
-   IMPLEMENTS = pack_double
-   IMPLEMENTS = unpack_double;unpack_float
-   IMPLEMENTS = value_count
-   MEMBERS=const char* half_byte
-   MEMBERS=const char* packingType
-   MEMBERS=const char* ieee_packing
-   MEMBERS=const char* precision
-   MEMBERS=const char* widthOfFirstOrderValues
-   MEMBERS=const char* N1
-   MEMBERS=const char* N2
-   MEMBERS=const char* numberOfGroups
-   MEMBERS=const char* numberOfSecondOrderPackedValues
-   MEMBERS=const char* extraValues
-   MEMBERS=const char* pl
-   MEMBERS=const char* Ni
-   MEMBERS=const char* Nj
-   MEMBERS=const char* jPointsAreConsecutive
-   MEMBERS=const char* bitmap
-   MEMBERS=const char* groupWidths
-
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_float(grib_accessor*, float* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_data_g1second_order_general_packing
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in values */
-    int  carg;
-    const char* seclen;
-    const char* offsetdata;
-    const char* offsetsection;
-    int dirty;
-    /* Members defined in data_simple_packing */
-    int edition;
-    const char*  units_factor;
-    const char*  units_bias;
-    const char*  changing_precision;
-    const char*  number_of_values;
-    const char*  bits_per_value;
-    const char*  reference_value;
-    const char*  binary_scale_factor;
-    const char*  decimal_scale_factor;
-    const char*  optimize_scaling_factor;
-    /* Members defined in data_g1second_order_general_packing */
-    const char* half_byte;
-    const char* packingType;
-    const char* ieee_packing;
-    const char* precision;
-    const char* widthOfFirstOrderValues;
-    const char* N1;
-    const char* N2;
-    const char* numberOfGroups;
-    const char* numberOfSecondOrderPackedValues;
-    const char* extraValues;
-    const char* pl;
-    const char* Ni;
-    const char* Nj;
-    const char* jPointsAreConsecutive;
-    const char* bitmap;
-    const char* groupWidths;
-} grib_accessor_data_g1second_order_general_packing;
-
-extern grib_accessor_class* grib_accessor_class_data_simple_packing;
-
-static grib_accessor_class _grib_accessor_class_data_g1second_order_general_packing = {
-    &grib_accessor_class_data_simple_packing,                      /* super */
-    "data_g1second_order_general_packing",                      /* name */
-    sizeof(grib_accessor_data_g1second_order_general_packing),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    &unpack_float,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_data_g1second_order_general_packing.h"
+#include "grib_scaling.h"
 
+grib_accessor_class_data_g1second_order_general_packing_t _grib_accessor_class_data_g1second_order_general_packing{"data_g1second_order_general_packing"};
 grib_accessor_class* grib_accessor_class_data_g1second_order_general_packing = &_grib_accessor_class_data_g1second_order_general_packing;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    grib_accessor_data_g1second_order_general_packing* self = (grib_accessor_data_g1second_order_general_packing*)a;
+void grib_accessor_class_data_g1second_order_general_packing_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    grib_accessor_data_g1second_order_general_packing_t* self = (grib_accessor_data_g1second_order_general_packing_t*)a;
     grib_handle* hand                                       = grib_handle_of_accessor(a);
 
     self->half_byte                       = grib_arguments_get_name(hand, args, self->carg++);
@@ -180,10 +41,9 @@ static void init(grib_accessor* a, const long v, grib_arguments* args)
     a->flags |= GRIB_ACCESSOR_FLAG_DATA;
 }
 
-static int value_count(grib_accessor* a, long* numberOfSecondOrderPackedValues)
-{
+int grib_accessor_class_data_g1second_order_general_packing_t::value_count(grib_accessor* a, long* numberOfSecondOrderPackedValues){
     int err                                                 = 0;
-    grib_accessor_data_g1second_order_general_packing* self = (grib_accessor_data_g1second_order_general_packing*)a;
+    grib_accessor_data_g1second_order_general_packing_t* self = (grib_accessor_data_g1second_order_general_packing_t*)a;
     *numberOfSecondOrderPackedValues                        = 0;
 
     err = grib_get_long_internal(grib_handle_of_accessor(a), self->numberOfSecondOrderPackedValues, numberOfSecondOrderPackedValues);
@@ -192,10 +52,9 @@ static int value_count(grib_accessor* a, long* numberOfSecondOrderPackedValues)
 }
 
 template <typename T>
-static int unpack(grib_accessor* a, T* values, size_t* len)
-{
+int unpack(grib_accessor* a, T* values, size_t* len){
     static_assert(std::is_floating_point<T>::value, "Requires floating point numbers");
-    grib_accessor_data_g1second_order_general_packing* self = (grib_accessor_data_g1second_order_general_packing*)a;
+    grib_accessor_data_g1second_order_general_packing_t* self = (grib_accessor_data_g1second_order_general_packing_t*)a;
     int ret                                                 = 0;
     long numberOfGroups, numberOfSecondOrderPackedValues;
     long* groupWidths            = 0;
@@ -213,8 +72,7 @@ static int unpack(grib_accessor* a, T* values, size_t* len)
     long groupLength, j;
     size_t groupWidthsSize;
 
-    buf += grib_byte_offset(a);
-
+    buf += a->byte_offset();
     if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->numberOfGroups, &numberOfGroups)) != GRIB_SUCCESS)
         return ret;
 
@@ -296,18 +154,15 @@ static int unpack(grib_accessor* a, T* values, size_t* len)
     return ret;
 }
 
-static int unpack_float(grib_accessor* a, float* values, size_t* len)
-{
+int grib_accessor_class_data_g1second_order_general_packing_t::unpack_float(grib_accessor* a, float* values, size_t* len){
     return unpack<float>(a, values, len);
 }
 
-static int unpack_double(grib_accessor* a, double* values, size_t* len)
-{
+int grib_accessor_class_data_g1second_order_general_packing_t::unpack_double(grib_accessor* a, double* values, size_t* len){
     return unpack<double>(a, values, len);
 }
 
-static int pack_double(grib_accessor* a, const double* cval, size_t* len)
-{
+int grib_accessor_class_data_g1second_order_general_packing_t::pack_double(grib_accessor* a, const double* cval, size_t* len){
     /* return GRIB_NOT_IMPLEMENTED; */
     int err           = 0;
     char type[]       = "grid_second_order";
diff --git a/src/accessor/grib_accessor_class_data_g1second_order_general_packing.h b/src/accessor/grib_accessor_class_data_g1second_order_general_packing.h
new file mode 100644
index 000000000..5161324f0
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_g1second_order_general_packing.h
@@ -0,0 +1,51 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_g1second_order_general_packing_h
+#define eccodes_accessor_data_g1second_order_general_packing_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_data_simple_packing.h"
+
+class grib_accessor_data_g1second_order_general_packing_t : public grib_accessor_data_simple_packing_t
+{
+public:
+    /* Members defined in data_g1second_order_general_packing */
+    const char* half_byte;
+    const char* packingType;
+    const char* ieee_packing;
+    const char* precision;
+    const char* widthOfFirstOrderValues;
+    const char* N1;
+    const char* N2;
+    const char* numberOfGroups;
+    const char* numberOfSecondOrderPackedValues;
+    const char* extraValues;
+    const char* pl;
+    const char* Ni;
+    const char* Nj;
+    const char* jPointsAreConsecutive;
+    const char* bitmap;
+    const char* groupWidths;
+};
+
+class grib_accessor_class_data_g1second_order_general_packing_t : public grib_accessor_class_data_simple_packing_t
+{
+public:
+    grib_accessor_class_data_g1second_order_general_packing_t(const char* name) : grib_accessor_class_data_simple_packing_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_g1second_order_general_packing_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_float(grib_accessor*, float* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_data_g1second_order_general_packing_h */
diff --git a/src/accessor/todo/grib_accessor_class_data_g1second_order_row_by_row_packing.cc b/src/accessor/grib_accessor_class_data_g1second_order_row_by_row_packing.cc
similarity index 64%
rename from src/accessor/todo/grib_accessor_class_data_g1second_order_row_by_row_packing.cc
rename to src/accessor/grib_accessor_class_data_g1second_order_row_by_row_packing.cc
index b801b3b1c..10dc06079 100644
--- a/src/accessor/todo/grib_accessor_class_data_g1second_order_row_by_row_packing.cc
+++ b/src/accessor/grib_accessor_class_data_g1second_order_row_by_row_packing.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,154 +9,16 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-#include "grib_scaling.h"
 #include "grib_api_internal.h"
+#include "grib_accessor_class_data_g1second_order_row_by_row_packing.h"
+#include "grib_scaling.h"
 
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_data_simple_packing
-   IMPLEMENTS = init
-   IMPLEMENTS = pack_double
-   IMPLEMENTS = unpack_double;unpack_float
-   IMPLEMENTS = value_count
-   MEMBERS=const char* half_byte
-   MEMBERS=const char* packingType
-   MEMBERS=const char* ieee_packing
-   MEMBERS=const char* precision
-   MEMBERS=const char* widthOfFirstOrderValues
-   MEMBERS=const char* N1
-   MEMBERS=const char* N2
-   MEMBERS=const char* numberOfGroups
-   MEMBERS=const char* numberOfSecondOrderPackedValues
-   MEMBERS=const char* extraValues
-   MEMBERS=const char* pl
-   MEMBERS=const char* Ni
-   MEMBERS=const char* Nj
-   MEMBERS=const char* jPointsAreConsecutive
-   MEMBERS=const char* bitmap
-   MEMBERS=const char* groupWidths
-
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_float(grib_accessor*, float* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_data_g1second_order_row_by_row_packing
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in values */
-    int  carg;
-    const char* seclen;
-    const char* offsetdata;
-    const char* offsetsection;
-    int dirty;
-    /* Members defined in data_simple_packing */
-    int edition;
-    const char*  units_factor;
-    const char*  units_bias;
-    const char*  changing_precision;
-    const char*  number_of_values;
-    const char*  bits_per_value;
-    const char*  reference_value;
-    const char*  binary_scale_factor;
-    const char*  decimal_scale_factor;
-    const char*  optimize_scaling_factor;
-    /* Members defined in data_g1second_order_row_by_row_packing */
-    const char* half_byte;
-    const char* packingType;
-    const char* ieee_packing;
-    const char* precision;
-    const char* widthOfFirstOrderValues;
-    const char* N1;
-    const char* N2;
-    const char* numberOfGroups;
-    const char* numberOfSecondOrderPackedValues;
-    const char* extraValues;
-    const char* pl;
-    const char* Ni;
-    const char* Nj;
-    const char* jPointsAreConsecutive;
-    const char* bitmap;
-    const char* groupWidths;
-} grib_accessor_data_g1second_order_row_by_row_packing;
-
-extern grib_accessor_class* grib_accessor_class_data_simple_packing;
-
-static grib_accessor_class _grib_accessor_class_data_g1second_order_row_by_row_packing = {
-    &grib_accessor_class_data_simple_packing,                      /* super */
-    "data_g1second_order_row_by_row_packing",                      /* name */
-    sizeof(grib_accessor_data_g1second_order_row_by_row_packing),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    &unpack_float,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
+grib_accessor_class_data_g1second_order_row_by_row_packing_t _grib_accessor_class_data_g1second_order_row_by_row_packing{"data_g1second_order_row_by_row_packing"};
 grib_accessor_class* grib_accessor_class_data_g1second_order_row_by_row_packing = &_grib_accessor_class_data_g1second_order_row_by_row_packing;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    grib_accessor_data_g1second_order_row_by_row_packing* self = (grib_accessor_data_g1second_order_row_by_row_packing*)a;
+void grib_accessor_class_data_g1second_order_row_by_row_packing_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    grib_accessor_data_g1second_order_row_by_row_packing_t* self = (grib_accessor_data_g1second_order_row_by_row_packing_t*)a;
     grib_handle* gh                                            = grib_handle_of_accessor(a);
 
     self->half_byte                       = grib_arguments_get_name(gh, args, self->carg++);
@@ -178,9 +41,8 @@ static void init(grib_accessor* a, const long v, grib_arguments* args)
     a->flags |= GRIB_ACCESSOR_FLAG_DATA;
 }
 
-static int value_count(grib_accessor* a, long* count)
-{
-    grib_accessor_data_g1second_order_row_by_row_packing* self = (grib_accessor_data_g1second_order_row_by_row_packing*)a;
+int grib_accessor_class_data_g1second_order_row_by_row_packing_t::value_count(grib_accessor* a, long* count){
+    grib_accessor_data_g1second_order_row_by_row_packing_t* self = (grib_accessor_data_g1second_order_row_by_row_packing_t*)a;
     grib_handle* gh                                            = grib_handle_of_accessor(a);
     long n = 0, i = 0;
     long numberOfRows          = 0;
@@ -254,9 +116,8 @@ static int value_count(grib_accessor* a, long* count)
 }
 
 template <typename T>
-static int unpack(grib_accessor* a, T* values, size_t* len)
-{
-    grib_accessor_data_g1second_order_row_by_row_packing* self = (grib_accessor_data_g1second_order_row_by_row_packing*)a;
+int unpack(grib_accessor* a, T* values, size_t* len){
+    grib_accessor_data_g1second_order_row_by_row_packing_t* self = (grib_accessor_data_g1second_order_row_by_row_packing_t*)a;
     grib_handle* gh                                            = grib_handle_of_accessor(a);
     int ret                                                    = 0;
     long numberOfGroups, numberOfSecondOrderPackedValues;
@@ -279,8 +140,7 @@ static int unpack(grib_accessor* a, T* values, size_t* len)
     size_t plSize          = 0;
     long* pl               = 0;
 
-    buf += grib_byte_offset(a);
-
+    buf += a->byte_offset();
     if ((ret = grib_get_long_internal(gh, self->numberOfGroups, &numberOfGroups)) != GRIB_SUCCESS)
         return ret;
 
@@ -421,18 +281,15 @@ static int unpack(grib_accessor* a, T* values, size_t* len)
     return ret;
 }
 
-static int unpack_float(grib_accessor* a, float* values, size_t* len)
-{
+int grib_accessor_class_data_g1second_order_row_by_row_packing_t::unpack_float(grib_accessor* a, float* values, size_t* len){
     return unpack<float>(a, values, len);
 }
 
-static int unpack_double(grib_accessor* a, double* values, size_t* len)
-{
+int grib_accessor_class_data_g1second_order_row_by_row_packing_t::unpack_double(grib_accessor* a, double* values, size_t* len){
     return unpack<double>(a, values, len);
 }
 
-static int pack_double(grib_accessor* a, const double* cval, size_t* len)
-{
+int grib_accessor_class_data_g1second_order_row_by_row_packing_t::pack_double(grib_accessor* a, const double* cval, size_t* len){
     int err         = 0;
     grib_handle* gh = grib_handle_of_accessor(a);
     char type[]     = "grid_second_order";
diff --git a/src/accessor/grib_accessor_class_data_g1second_order_row_by_row_packing.h b/src/accessor/grib_accessor_class_data_g1second_order_row_by_row_packing.h
new file mode 100644
index 000000000..1e9c27f39
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_g1second_order_row_by_row_packing.h
@@ -0,0 +1,51 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_g1second_order_row_by_row_packing_h
+#define eccodes_accessor_data_g1second_order_row_by_row_packing_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_data_simple_packing.h"
+
+class grib_accessor_data_g1second_order_row_by_row_packing_t : public grib_accessor_data_simple_packing_t
+{
+public:
+    /* Members defined in data_g1second_order_row_by_row_packing */
+    const char* half_byte;
+    const char* packingType;
+    const char* ieee_packing;
+    const char* precision;
+    const char* widthOfFirstOrderValues;
+    const char* N1;
+    const char* N2;
+    const char* numberOfGroups;
+    const char* numberOfSecondOrderPackedValues;
+    const char* extraValues;
+    const char* pl;
+    const char* Ni;
+    const char* Nj;
+    const char* jPointsAreConsecutive;
+    const char* bitmap;
+    const char* groupWidths;
+};
+
+class grib_accessor_class_data_g1second_order_row_by_row_packing_t : public grib_accessor_class_data_simple_packing_t
+{
+public:
+    grib_accessor_class_data_g1second_order_row_by_row_packing_t(const char* name) : grib_accessor_class_data_simple_packing_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_g1second_order_row_by_row_packing_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_float(grib_accessor*, float* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_data_g1second_order_row_by_row_packing_h */
diff --git a/src/accessor/grib_accessor_class_data_g1secondary_bitmap.cc b/src/accessor/grib_accessor_class_data_g1secondary_bitmap.cc
new file mode 100644
index 000000000..cbabc9cf1
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_g1secondary_bitmap.cc
@@ -0,0 +1,128 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_data_g1secondary_bitmap.h"
+
+grib_accessor_class_data_g1secondary_bitmap_t _grib_accessor_class_data_g1secondary_bitmap{"data_g1secondary_bitmap"};
+grib_accessor_class* grib_accessor_class_data_g1secondary_bitmap = &_grib_accessor_class_data_g1secondary_bitmap;
+
+
+void grib_accessor_class_data_g1secondary_bitmap_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    grib_accessor_data_g1secondary_bitmap_t* self = (grib_accessor_data_g1secondary_bitmap_t*)a;
+    self->number_of_ones                        = grib_arguments_get_name(grib_handle_of_accessor(a), args, 4);
+}
+
+int grib_accessor_class_data_g1secondary_bitmap_t::value_count(grib_accessor* a, long* count){
+    grib_accessor_data_g1secondary_bitmap_t* self = (grib_accessor_data_g1secondary_bitmap_t*)a;
+    size_t len                                  = 0;
+    int err                                     = 0;
+    long expand_by;
+    *count = 0;
+
+    err = grib_get_long_internal(grib_handle_of_accessor(a), self->expand_by, &expand_by);
+    if (err)
+        return err;
+
+    err = grib_get_size(grib_handle_of_accessor(a), self->primary_bitmap, &len);
+    if (err)
+        return err;
+
+    *count = expand_by * len;
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_data_g1secondary_bitmap_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_data_g1secondary_bitmap_t* self = (grib_accessor_data_g1secondary_bitmap_t*)a;
+
+    int err = 0;
+
+    long primary_len         = 0;
+    long secondary_len       = 0;
+    double* primary_bitmap   = NULL;
+    double* secondary_bitmap = NULL;
+    long i                   = 0;
+    long j                   = 0;
+    long on                  = 0;
+    long k;
+    long m;
+    double missing_value = 0;
+    double present_value = 0;
+    long expand_by       = 0;
+
+    if (*len == 0)
+        return GRIB_NO_VALUES;
+
+    if ((err = grib_get_long(grib_handle_of_accessor(a), self->expand_by, &expand_by)) != GRIB_SUCCESS)
+        return err;
+    if (expand_by <= 0)
+        return GRIB_ENCODING_ERROR;
+
+    if ((err = grib_get_double_internal(grib_handle_of_accessor(a), self->missing_value, &missing_value)) != GRIB_SUCCESS)
+        return err;
+
+    if (*len % expand_by) {
+        /*TODO: issue warning */
+        return GRIB_ENCODING_ERROR;
+    }
+
+    primary_len    = *len / expand_by;
+    primary_bitmap = (double*)grib_context_malloc_clear(a->context, primary_len * sizeof(double));
+    if (!primary_bitmap)
+        return GRIB_OUT_OF_MEMORY;
+
+    secondary_len    = *len;
+    secondary_bitmap = (double*)grib_context_malloc_clear(a->context, secondary_len * sizeof(double));
+    if (!secondary_bitmap) {
+        grib_context_free(a->context, primary_bitmap);
+        return GRIB_OUT_OF_MEMORY;
+    }
+
+    if (missing_value == 0)
+        present_value = 1;
+    else
+        present_value = 0;
+
+    k = 0;
+    m = 0;
+    for (i = 0; i < *len; i += expand_by) {
+        int cnt = 0;
+        for (j = 0; j < expand_by; j++)
+            if (val[i + j] == missing_value)
+                cnt++;
+
+        if (cnt == expand_by) /* all expand_by values are missing */
+            primary_bitmap[k++] = missing_value;
+        else {
+            primary_bitmap[k++] = present_value;
+            for (j = 0; j < expand_by; j++)
+                secondary_bitmap[m++] = val[i + j];
+            on++;
+        }
+    }
+
+    *len = k;
+
+    /*printf("QQQQQQQ %ld %ld second=%ld\n",primary_len,on,m);*/
+    Assert(k == primary_len);
+
+    err = grib_set_double_array_internal(grib_handle_of_accessor(a), self->primary_bitmap, primary_bitmap, k);
+    if (err == GRIB_SUCCESS)
+        err = grib_set_double_array_internal(grib_handle_of_accessor(a), self->secondary_bitmap, secondary_bitmap, m);
+
+    grib_context_free(a->context, primary_bitmap);
+    grib_context_free(a->context, secondary_bitmap);
+
+    if (err == GRIB_SUCCESS)
+        err = grib_set_long_internal(grib_handle_of_accessor(a), self->number_of_ones, on);
+
+    return err;
+}
diff --git a/src/accessor/grib_accessor_class_data_g1secondary_bitmap.h b/src/accessor/grib_accessor_class_data_g1secondary_bitmap.h
new file mode 100644
index 000000000..e963d6f44
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_g1secondary_bitmap.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_g1secondary_bitmap_h
+#define eccodes_accessor_data_g1secondary_bitmap_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_data_secondary_bitmap.h"
+
+class grib_accessor_data_g1secondary_bitmap_t : public grib_accessor_data_secondary_bitmap_t
+{
+public:
+    /* Members defined in data_g1secondary_bitmap */
+    const char*  number_of_ones;
+};
+
+class grib_accessor_class_data_g1secondary_bitmap_t : public grib_accessor_class_data_secondary_bitmap_t
+{
+public:
+    grib_accessor_class_data_g1secondary_bitmap_t(const char* name) : grib_accessor_class_data_secondary_bitmap_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_g1secondary_bitmap_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_data_g1secondary_bitmap_h */
diff --git a/src/accessor/grib_accessor_class_data_g1shsimple_packing.cc b/src/accessor/grib_accessor_class_data_g1shsimple_packing.cc
new file mode 100644
index 000000000..d6a8a6562
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_g1shsimple_packing.cc
@@ -0,0 +1,64 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_data_g1shsimple_packing.h"
+
+grib_accessor_class_data_g1shsimple_packing_t _grib_accessor_class_data_g1shsimple_packing{"data_g1shsimple_packing"};
+grib_accessor_class* grib_accessor_class_data_g1shsimple_packing = &_grib_accessor_class_data_g1shsimple_packing;
+
+
+
+int grib_accessor_class_data_g1shsimple_packing_t::value_count(grib_accessor* a, long* count){
+    grib_accessor_data_g1shsimple_packing_t* self = (grib_accessor_data_g1shsimple_packing_t*)a;
+    size_t len                                  = 0;
+    int err                                     = 0;
+
+    err = grib_get_size(grib_handle_of_accessor(a), self->coded_values, &len);
+    len += 1;
+
+    *count = len;
+    return err;
+}
+
+int grib_accessor_class_data_g1shsimple_packing_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_data_g1shsimple_packing_t* self = (grib_accessor_data_g1shsimple_packing_t*)a;
+    int err                                     = GRIB_SUCCESS;
+
+    size_t coded_n_vals = 0;
+    size_t n_vals       = 0;
+
+    if ((err = grib_get_size(grib_handle_of_accessor(a), self->coded_values, &coded_n_vals)) != GRIB_SUCCESS)
+        return err;
+
+    n_vals = coded_n_vals + 1;
+
+    if (*len < n_vals) {
+        *len = n_vals;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    if ((err = grib_get_double_internal(grib_handle_of_accessor(a), self->real_part, val)) != GRIB_SUCCESS)
+        return err;
+
+    val++;
+
+    if ((err = grib_get_double_array_internal(grib_handle_of_accessor(a), self->coded_values, val, &coded_n_vals)) != GRIB_SUCCESS)
+        return err;
+
+    grib_context_log(a->context, GRIB_LOG_DEBUG,
+                     "grib_accessor_data_g1shsimple_packing_t_bitmap : unpack_double : creating %s, %d values",
+                     a->name, n_vals);
+
+    *len = n_vals;
+
+    return err;
+}
diff --git a/src/accessor/grib_accessor_class_data_g1shsimple_packing.h b/src/accessor/grib_accessor_class_data_g1shsimple_packing.h
new file mode 100644
index 000000000..0c8efffa1
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_g1shsimple_packing.h
@@ -0,0 +1,32 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_g1shsimple_packing_h
+#define eccodes_accessor_data_g1shsimple_packing_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_data_shsimple_packing.h"
+
+class grib_accessor_data_g1shsimple_packing_t : public grib_accessor_data_shsimple_packing_t
+{
+public:
+    /* Members defined in data_g1shsimple_packing */
+};
+
+class grib_accessor_class_data_g1shsimple_packing_t : public grib_accessor_class_data_shsimple_packing_t
+{
+public:
+    grib_accessor_class_data_g1shsimple_packing_t(const char* name) : grib_accessor_class_data_shsimple_packing_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_g1shsimple_packing_t{}; }
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+};
+#endif /* eccodes_accessor_data_g1shsimple_packing_h */
diff --git a/src/accessor/todo/grib_accessor_class_data_g1simple_packing.cc b/src/accessor/grib_accessor_class_data_g1simple_packing.cc
similarity index 64%
rename from src/accessor/todo/grib_accessor_class_data_g1simple_packing.cc
rename to src/accessor/grib_accessor_class_data_g1simple_packing.cc
index cc810e4ae..a3320a810 100644
--- a/src/accessor/todo/grib_accessor_class_data_g1simple_packing.cc
+++ b/src/accessor/grib_accessor_class_data_g1simple_packing.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,126 +9,16 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-#include "grib_scaling.h"
 #include "grib_api_internal.h"
+#include "grib_accessor_class_data_g1simple_packing.h"
+#include "grib_scaling.h"
 
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_data_simple_packing
-   IMPLEMENTS = init
-   IMPLEMENTS = pack_double
-   IMPLEMENTS = value_count
-   MEMBERS=const char*  half_byte
-   MEMBERS=const char*  packingType
-   MEMBERS=const char*  ieee_packing
-   MEMBERS=const char*  precision
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_data_g1simple_packing
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in values */
-    int  carg;
-    const char* seclen;
-    const char* offsetdata;
-    const char* offsetsection;
-    int dirty;
-    /* Members defined in data_simple_packing */
-    int edition;
-    const char*  units_factor;
-    const char*  units_bias;
-    const char*  changing_precision;
-    const char*  number_of_values;
-    const char*  bits_per_value;
-    const char*  reference_value;
-    const char*  binary_scale_factor;
-    const char*  decimal_scale_factor;
-    const char*  optimize_scaling_factor;
-    /* Members defined in data_g1simple_packing */
-    const char*  half_byte;
-    const char*  packingType;
-    const char*  ieee_packing;
-    const char*  precision;
-} grib_accessor_data_g1simple_packing;
-
-extern grib_accessor_class* grib_accessor_class_data_simple_packing;
-
-static grib_accessor_class _grib_accessor_class_data_g1simple_packing = {
-    &grib_accessor_class_data_simple_packing,                      /* super */
-    "data_g1simple_packing",                      /* name */
-    sizeof(grib_accessor_data_g1simple_packing),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
+grib_accessor_class_data_g1simple_packing_t _grib_accessor_class_data_g1simple_packing{"data_g1simple_packing"};
 grib_accessor_class* grib_accessor_class_data_g1simple_packing = &_grib_accessor_class_data_g1simple_packing;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    grib_accessor_data_g1simple_packing* self = (grib_accessor_data_g1simple_packing*)a;
+void grib_accessor_class_data_g1simple_packing_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    grib_accessor_data_g1simple_packing_t* self = (grib_accessor_data_g1simple_packing_t*)a;
 
     self->half_byte    = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
     self->packingType  = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
@@ -137,9 +28,8 @@ static void init(grib_accessor* a, const long v, grib_arguments* args)
     a->flags |= GRIB_ACCESSOR_FLAG_DATA;
 }
 
-static int value_count(grib_accessor* a, long* number_of_values)
-{
-    grib_accessor_data_g1simple_packing* self = (grib_accessor_data_g1simple_packing*)a;
+int grib_accessor_class_data_g1simple_packing_t::value_count(grib_accessor* a, long* number_of_values){
+    grib_accessor_data_g1simple_packing_t* self = (grib_accessor_data_g1simple_packing_t*)a;
     *number_of_values                         = 0;
 
     /* Special case for when values are cleared */
@@ -149,10 +39,8 @@ static int value_count(grib_accessor* a, long* number_of_values)
     return grib_get_long_internal(grib_handle_of_accessor(a), self->number_of_values, number_of_values);
 }
 
-static int pack_double(grib_accessor* a, const double* cval, size_t* len)
-{
-    grib_accessor_data_g1simple_packing* self = (grib_accessor_data_g1simple_packing*)a;
-    grib_accessor_class* super                = *(a->cclass->super);
+int grib_accessor_class_data_g1simple_packing_t::pack_double(grib_accessor* a, const double* cval, size_t* len){
+    grib_accessor_data_g1simple_packing_t* self = (grib_accessor_data_g1simple_packing_t*)a;
 
     size_t n_vals             = *len;
     long half_byte            = 0;
@@ -234,7 +122,7 @@ static int pack_double(grib_accessor* a, const double* cval, size_t* len)
         }
     }
 
-    ret = super->pack_double(a, val, len);
+    ret = grib_accessor_class_data_simple_packing_t::pack_double(a, val, len);
     switch (ret) {
         case GRIB_CONSTANT_FIELD:
             ret = grib_get_long(grib_handle_of_accessor(a), "constantFieldHalfByte", &constantFieldHalfByte);
@@ -319,7 +207,7 @@ static int pack_double(grib_accessor* a, const double* cval, size_t* len)
     grib_encode_double_array(n_vals, val, bits_per_value, reference_value, decimal, divisor, encoded, &off);
 
     grib_context_log(a->context, GRIB_LOG_DEBUG,
-                     "grib_accessor_data_g1simple_packing : pack_double : packing %s, %d values", a->name, n_vals);
+                     "grib_accessor_data_g1simple_packing_t : pack_double : packing %s, %d values", a->name, n_vals);
 
     ret = grib_buffer_replace(a, buf, buflen, 1, 1);
     if (ret != GRIB_SUCCESS) return ret;
diff --git a/src/accessor/grib_accessor_class_data_g1simple_packing.h b/src/accessor/grib_accessor_class_data_g1simple_packing.h
new file mode 100644
index 000000000..3a351d17f
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_g1simple_packing.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_g1simple_packing_h
+#define eccodes_accessor_data_g1simple_packing_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_data_simple_packing.h"
+
+class grib_accessor_data_g1simple_packing_t : public grib_accessor_data_simple_packing_t
+{
+public:
+    /* Members defined in data_g1simple_packing */
+    const char*  half_byte;
+    const char*  packingType;
+    const char*  ieee_packing;
+    const char*  precision;
+};
+
+class grib_accessor_class_data_g1simple_packing_t : public grib_accessor_class_data_simple_packing_t
+{
+public:
+    grib_accessor_class_data_g1simple_packing_t(const char* name) : grib_accessor_class_data_simple_packing_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_g1simple_packing_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_data_g1simple_packing_h */
diff --git a/src/accessor/todo/grib_accessor_class_data_g22order_packing.cc b/src/accessor/grib_accessor_class_data_g22order_packing.cc
similarity index 88%
rename from src/accessor/todo/grib_accessor_class_data_g22order_packing.cc
rename to src/accessor/grib_accessor_class_data_g22order_packing.cc
index 4ed535d29..e8e9aed36 100644
--- a/src/accessor/todo/grib_accessor_class_data_g22order_packing.cc
+++ b/src/accessor/grib_accessor_class_data_g22order_packing.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,157 +9,16 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-
-#include "grib_scaling.h"
 #include "grib_api_internal.h"
-#include <type_traits>
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_values
-   IMPLEMENTS = init
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = unpack_float
-   IMPLEMENTS = pack_double
-   IMPLEMENTS = unpack_double_element;unpack_double_element_set
-   IMPLEMENTS = value_count
-   MEMBERS=const char*  numberOfValues
-   MEMBERS=const char*  bits_per_value
-   MEMBERS=const char*  reference_value
-   MEMBERS=const char*  binary_scale_factor
-   MEMBERS=const char*  decimal_scale_factor
-   MEMBERS=const char*  optimize_scale_factor
-   MEMBERS=const char*  typeOfOriginalFieldValues
-   MEMBERS=const char*  groupSplittingMethodUsed
-   MEMBERS=const char*  missingValueManagementUsed
-   MEMBERS=const char*  primaryMissingValueSubstitute
-   MEMBERS=const char*  secondaryMissingValueSubstitute
-   MEMBERS=const char*  numberOfGroupsOfDataValues
-   MEMBERS=const char*  referenceForGroupWidths
-   MEMBERS=const char*  numberOfBitsUsedForTheGroupWidths
-   MEMBERS=const char*  referenceForGroupLengths
-   MEMBERS=const char*  lengthIncrementForTheGroupLengths
-   MEMBERS=const char*  trueLengthOfLastGroup
-   MEMBERS=const char*  numberOfBitsUsedForTheScaledGroupLengths
-   MEMBERS=const char*  orderOfSpatialDifferencing
-   MEMBERS=const char*  numberOfOctetsExtraDescriptors
-
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_float(grib_accessor*, float* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static int unpack_double_element(grib_accessor*, size_t i, double* val);
-static int unpack_double_element_set(grib_accessor*, const size_t* index_array, size_t len, double* val_array);
-
-typedef struct grib_accessor_data_g22order_packing
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in values */
-    int  carg;
-    const char* seclen;
-    const char* offsetdata;
-    const char* offsetsection;
-    int dirty;
-    /* Members defined in data_g22order_packing */
-    const char*  numberOfValues;
-    const char*  bits_per_value;
-    const char*  reference_value;
-    const char*  binary_scale_factor;
-    const char*  decimal_scale_factor;
-    const char*  optimize_scale_factor;
-    const char*  typeOfOriginalFieldValues;
-    const char*  groupSplittingMethodUsed;
-    const char*  missingValueManagementUsed;
-    const char*  primaryMissingValueSubstitute;
-    const char*  secondaryMissingValueSubstitute;
-    const char*  numberOfGroupsOfDataValues;
-    const char*  referenceForGroupWidths;
-    const char*  numberOfBitsUsedForTheGroupWidths;
-    const char*  referenceForGroupLengths;
-    const char*  lengthIncrementForTheGroupLengths;
-    const char*  trueLengthOfLastGroup;
-    const char*  numberOfBitsUsedForTheScaledGroupLengths;
-    const char*  orderOfSpatialDifferencing;
-    const char*  numberOfOctetsExtraDescriptors;
-} grib_accessor_data_g22order_packing;
-
-extern grib_accessor_class* grib_accessor_class_values;
-
-static grib_accessor_class _grib_accessor_class_data_g22order_packing = {
-    &grib_accessor_class_values,                      /* super */
-    "data_g22order_packing",                      /* name */
-    sizeof(grib_accessor_data_g22order_packing),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    &unpack_float,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    &unpack_double_element,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    &unpack_double_element_set,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_data_g22order_packing.h"
+#include "../grib_scaling.h"
 
+grib_accessor_class_data_g22order_packing_t _grib_accessor_class_data_g22order_packing{"data_g22order_packing"};
 grib_accessor_class* grib_accessor_class_data_g22order_packing = &_grib_accessor_class_data_g22order_packing;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    grib_accessor_data_g22order_packing* self = reinterpret_cast<grib_accessor_data_g22order_packing*>(a);
+void grib_accessor_class_data_g22order_packing_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    grib_accessor_data_g22order_packing_t* self = reinterpret_cast<grib_accessor_data_g22order_packing_t*>(a);
     grib_handle* gh                           = grib_handle_of_accessor(a);
 
     self->numberOfValues       = grib_arguments_get_name(gh, args, self->carg++);
@@ -206,14 +66,12 @@ struct bitstream_context {
     int n_bitstream;
 };
 
-static void init_bitstream(bitstream_context *ctx, unsigned char* new_bitstream)
-{
+void init_bitstream(bitstream_context *ctx, unsigned char* new_bitstream){
     ctx->bitstream   = new_bitstream;
     ctx->n_bitstream = ctx->reg = ctx->rbits = 0;
 }
 
-static void finish_bitstream(bitstream_context *ctx)
-{
+void finish_bitstream(bitstream_context *ctx){
     if (ctx->rbits) {
         ctx->n_bitstream++;
         *ctx->bitstream++ = (ctx->reg << (8 - ctx->rbits)) & 255;
@@ -221,8 +79,7 @@ static void finish_bitstream(bitstream_context *ctx)
     }
 }
 
-static void add_many_bitstream(bitstream_context *ctx, grib_accessor* a, int* t, int n, int n_bits)
-{
+void add_many_bitstream(bitstream_context *ctx, grib_accessor* a, int* t, int n, int n_bits){
     unsigned int jmask;
     int i;
     const int max_numbits = 25;
@@ -245,8 +102,7 @@ static void add_many_bitstream(bitstream_context *ctx, grib_accessor* a, int* t,
     }
 }
 
-static void add_bitstream(bitstream_context *ctx, grib_accessor* a, int t, int n_bits)
-{
+void add_bitstream(bitstream_context *ctx, grib_accessor* a, int t, int n_bits){
     unsigned int jmask;
     const int max_numbits = 25;
 
@@ -270,8 +126,7 @@ static void add_bitstream(bitstream_context *ctx, grib_accessor* a, int t, int n
 // find min/max of an integer array
 // return 0:  if min max found
 // return 1:  if min max not found, min = max = 0
-static int int_min_max_array(int* data, unsigned int n, int* min, int* max)
-{
+int int_min_max_array(int* data, unsigned int n, int* min, int* max){
     unsigned int first;
     int mn, mx;
 
@@ -312,8 +167,7 @@ static int int_min_max_array(int* data, unsigned int n, int* min, int* max)
     return 0;
 }
 
-static double Int_Power(double x, int y)
-{
+double Int_Power(double x, int y){
     double value;
 
     if (y < 0) {
@@ -332,8 +186,7 @@ static double Int_Power(double x, int y)
     return value;
 }
 
-static int min_max_array(double* data, unsigned int n, double* min, double* max)
-{
+int min_max_array(double* data, unsigned int n, double* min, double* max){
     unsigned int first;
     double mn, mx;
 
@@ -445,8 +298,7 @@ static int min_max_array(double* data, unsigned int n, double* min, double* max)
 //     return bms;
 // }
 
-static int post_process(grib_context* c, long* vals, long len, long order, long bias, const unsigned long extras[2])
-{
+int post_process(grib_context* c, long* vals, long len, long order, long bias, const unsigned long extras[2]){
     unsigned long last, penultimate = 0, j = 0;
     Assert(order > 0);
     Assert(order <= 3);
@@ -507,10 +359,9 @@ static int post_process(grib_context* c, long* vals, long len, long order, long
 }
 
 template <typename T>
-static int unpack(grib_accessor* a, T* val, const size_t* len)
-{
+int unpack(grib_accessor* a, T* val, const size_t* len){
     static_assert(std::is_floating_point<T>::value, "Requires floating points numbers");
-    grib_accessor_data_g22order_packing* self = reinterpret_cast<grib_accessor_data_g22order_packing*>(a);
+    grib_accessor_data_g22order_packing_t* self = reinterpret_cast<grib_accessor_data_g22order_packing_t*>(a);
     const char* cclass_name = a->cclass->name;
     grib_handle* gh         = grib_handle_of_accessor(a);
 
@@ -557,8 +408,7 @@ static int unpack(grib_accessor* a, T* val, const size_t* len)
     long numberOfOctetsExtraDescriptors = 0;
     double missingValue = 0;
 
-    err = grib_value_count(a, &n_vals);
-    if (err)
+    err = a->value_count(&n_vals);    if (err)
         return err;
 
     if (*len < static_cast<size_t>(n_vals))
@@ -755,8 +605,7 @@ static int unpack(grib_accessor* a, T* val, const size_t* len)
     return err;
 }
 
-static int find_nbits(unsigned int i)
-{
+int find_nbits(unsigned int i){
 #if !defined __GNUC__ || __GNUC__ < 4
     int j;
     j = 0;
@@ -794,8 +643,7 @@ struct section
     struct section *head, *tail;
 };
 
-static int sizeofsection(struct section* s, int ref_bits, int width_bits, int has_undef)
-{
+int sizeofsection(struct section* s, int ref_bits, int width_bits, int has_undef){
     if (s->mn == INT_MAX) {  // all undef
         return ref_bits + width_bits;
     }
@@ -823,8 +671,7 @@ static int sizeofsection2(int mn, int mx, int n, int ref_bits, int width_bits,
     return find_nbits(mx - mn + has_undef) * n + ref_bits + width_bits;
 }
 
-static int size_all(struct section* s, int ref_bits, int width_bits, int has_undef)
-{
+int size_all(struct section* s, int ref_bits, int width_bits, int has_undef){
     int bits;
 
     bits = 0;
@@ -835,8 +682,7 @@ static int size_all(struct section* s, int ref_bits, int width_bits, int has_und
     return (bits + 7) / 8;
 }
 
-static void move_one_left(struct section* s, int* v)
-{
+void move_one_left(struct section* s, int* v){
     struct section* t;
     int val, i, j, k;
 
@@ -901,8 +747,7 @@ static void move_one_left(struct section* s, int* v)
     }
 }
 
-static void move_one_right(struct section* s, int* v)
-{
+void move_one_right(struct section* s, int* v){
     struct section* t;
     int val, i, j, k;
 
@@ -983,8 +828,7 @@ static void move_one_right(struct section* s, int* v)
     return;
 }
 
-static void exchange(struct section* s, int* v, int has_undef, int LEN_SEC_MAX)
-{
+void exchange(struct section* s, int* v, int has_undef, int LEN_SEC_MAX){
     struct section* t;
     int val0, val1, nbit_s, nbit_t;
 
@@ -1059,8 +903,7 @@ static void exchange(struct section* s, int* v, int has_undef, int LEN_SEC_MAX)
     }
 }
 
-static void merge_j(struct section* h, int ref_bits, int width_bits, int has_undef, int param, int LEN_SEC_MAX)
-{
+void merge_j(struct section* h, int ref_bits, int width_bits, int has_undef, int param, int LEN_SEC_MAX){
     struct section *t, *m;
     int size_head, size_mid, size_tail, saving_mt, saving_hm;
     int min0, max0, min1, max1;
@@ -1164,9 +1007,8 @@ static void merge_j(struct section* h, int ref_bits, int width_bits, int has_und
     }
 }
 
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_data_g22order_packing* self = reinterpret_cast<grib_accessor_data_g22order_packing*>(a);
+int grib_accessor_class_data_g22order_packing_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_data_g22order_packing_t* self = reinterpret_cast<grib_accessor_data_g22order_packing_t*>(a);
     grib_handle* gh = grib_handle_of_accessor(a);
     const char* cclass_name = a->cclass->name;
 
@@ -1850,18 +1692,15 @@ static int pack_double(grib_accessor* a, const double* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
+int grib_accessor_class_data_g22order_packing_t::unpack_double(grib_accessor* a, double* val, size_t* len){
     return unpack<double>(a, val, len);
 }
 
-static int unpack_float(grib_accessor* a, float* val, size_t* len)
-{
+int grib_accessor_class_data_g22order_packing_t::unpack_float(grib_accessor* a, float* val, size_t* len){
     return unpack<float>(a, val, len);
 }
 
-static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
-{
+int grib_accessor_class_data_g22order_packing_t::unpack_double_element(grib_accessor* a, size_t idx, double* val){
     size_t size    = 0;
     double* values = NULL;
     int err        = grib_get_size(grib_handle_of_accessor(a), "codedValues", &size);
@@ -1881,8 +1720,7 @@ static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
     return GRIB_SUCCESS;
 }
 
-static int unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array)
-{
+int grib_accessor_class_data_g22order_packing_t::unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array){
     size_t size = 0, i = 0;
     double* values;
     int err = 0;
@@ -1909,9 +1747,8 @@ static int unpack_double_element_set(grib_accessor* a, const size_t* index_array
     return GRIB_SUCCESS;
 }
 
-static int value_count(grib_accessor* a, long* count)
-{
-    grib_accessor_data_g22order_packing* self = reinterpret_cast<grib_accessor_data_g22order_packing*>(a);
+int grib_accessor_class_data_g22order_packing_t::value_count(grib_accessor* a, long* count){
+    grib_accessor_data_g22order_packing_t* self = reinterpret_cast<grib_accessor_data_g22order_packing_t*>(a);
     *count                                    = 0;
     return grib_get_long_internal(grib_handle_of_accessor(a), self->numberOfValues, count);
 }
diff --git a/src/accessor/grib_accessor_class_data_g22order_packing.h b/src/accessor/grib_accessor_class_data_g22order_packing.h
new file mode 100644
index 000000000..87d7e3a8d
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_g22order_packing.h
@@ -0,0 +1,57 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_g22order_packing_h
+#define eccodes_accessor_data_g22order_packing_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_values.h"
+
+class grib_accessor_data_g22order_packing_t : public grib_accessor_values_t
+{
+public:
+    /* Members defined in data_g22order_packing */
+    const char*  numberOfValues;
+    const char*  bits_per_value;
+    const char*  reference_value;
+    const char*  binary_scale_factor;
+    const char*  decimal_scale_factor;
+    const char*  optimize_scale_factor;
+    const char*  typeOfOriginalFieldValues;
+    const char*  groupSplittingMethodUsed;
+    const char*  missingValueManagementUsed;
+    const char*  primaryMissingValueSubstitute;
+    const char*  secondaryMissingValueSubstitute;
+    const char*  numberOfGroupsOfDataValues;
+    const char*  referenceForGroupWidths;
+    const char*  numberOfBitsUsedForTheGroupWidths;
+    const char*  referenceForGroupLengths;
+    const char*  lengthIncrementForTheGroupLengths;
+    const char*  trueLengthOfLastGroup;
+    const char*  numberOfBitsUsedForTheScaledGroupLengths;
+    const char*  orderOfSpatialDifferencing;
+    const char*  numberOfOctetsExtraDescriptors;
+};
+
+class grib_accessor_class_data_g22order_packing_t : public grib_accessor_class_values_t
+{
+public:
+    grib_accessor_class_data_g22order_packing_t(const char* name) : grib_accessor_class_values_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_g22order_packing_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_float(grib_accessor*, float* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    int unpack_double_element(grib_accessor*, size_t i, double* val) override;
+    int unpack_double_element_set(grib_accessor*, const size_t* index_array, size_t len, double* val_array) override;
+};
+#endif /* eccodes_accessor_data_g22order_packing_h */
diff --git a/src/accessor/todo/grib_accessor_class_data_g2bifourier_packing.cc b/src/accessor/grib_accessor_class_data_g2bifourier_packing.cc
similarity index 77%
rename from src/accessor/todo/grib_accessor_class_data_g2bifourier_packing.cc
rename to src/accessor/grib_accessor_class_data_g2bifourier_packing.cc
index 86275d470..f4196a36c 100644
--- a/src/accessor/todo/grib_accessor_class_data_g2bifourier_packing.cc
+++ b/src/accessor/grib_accessor_class_data_g2bifourier_packing.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,156 +9,19 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-/********************************
- *   philippe.marguinaud@meteo.fr
- *******************************/
-
-#include "grib_scaling.h"
 #include "grib_api_internal.h"
-#include "grib_optimize_decimal_factor.h"
-#include <cmath>
-#include <algorithm>
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_data_simple_packing
-   IMPLEMENTS = init
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = pack_double
-   IMPLEMENTS = value_count
-   MEMBERS= const char*  ieee_floats
-   MEMBERS= const char*  laplacianOperatorIsSet
-   MEMBERS= const char*  laplacianOperator
-   MEMBERS= const char*  biFourierTruncationType
-   MEMBERS= const char*  sub_i
-   MEMBERS= const char*  sub_j
-   MEMBERS= const char*  bif_i
-   MEMBERS= const char*  bif_j
-   MEMBERS= const char*  biFourierSubTruncationType
-   MEMBERS= const char*  biFourierDoNotPackAxes
-   MEMBERS= const char*  biFourierMakeTemplate
-   MEMBERS= const char*  totalNumberOfValuesInUnpackedSubset
-   MEMBERS=const char*  numberOfValues
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_data_g2bifourier_packing
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in values */
-    int  carg;
-    const char* seclen;
-    const char* offsetdata;
-    const char* offsetsection;
-    int dirty;
-    /* Members defined in data_simple_packing */
-    int edition;
-    const char*  units_factor;
-    const char*  units_bias;
-    const char*  changing_precision;
-    const char*  number_of_values;
-    const char*  bits_per_value;
-    const char*  reference_value;
-    const char*  binary_scale_factor;
-    const char*  decimal_scale_factor;
-    const char*  optimize_scaling_factor;
-    /* Members defined in data_g2bifourier_packing */
-    const char*  ieee_floats;
-    const char*  laplacianOperatorIsSet;
-    const char*  laplacianOperator;
-    const char*  biFourierTruncationType;
-    const char*  sub_i;
-    const char*  sub_j;
-    const char*  bif_i;
-    const char*  bif_j;
-    const char*  biFourierSubTruncationType;
-    const char*  biFourierDoNotPackAxes;
-    const char*  biFourierMakeTemplate;
-    const char*  totalNumberOfValuesInUnpackedSubset;
-    const char*  numberOfValues;
-} grib_accessor_data_g2bifourier_packing;
-
-extern grib_accessor_class* grib_accessor_class_data_simple_packing;
-
-static grib_accessor_class _grib_accessor_class_data_g2bifourier_packing = {
-    &grib_accessor_class_data_simple_packing,                      /* super */
-    "data_g2bifourier_packing",                      /* name */
-    sizeof(grib_accessor_data_g2bifourier_packing),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_data_g2bifourier_packing.h"
+#include "grib_scaling.h"
 
+grib_accessor_class_data_g2bifourier_packing_t _grib_accessor_class_data_g2bifourier_packing{"data_g2bifourier_packing"};
 grib_accessor_class* grib_accessor_class_data_g2bifourier_packing = &_grib_accessor_class_data_g2bifourier_packing;
 
-/* END_CLASS_IMP */
 
 typedef unsigned long (*encode_float_proc)(double);
 typedef double (*decode_float_proc)(unsigned long);
 
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    grib_accessor_data_g2bifourier_packing* self = (grib_accessor_data_g2bifourier_packing*)a;
+void grib_accessor_class_data_g2bifourier_packing_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    grib_accessor_data_g2bifourier_packing_t* self = (grib_accessor_data_g2bifourier_packing_t*)a;
     grib_handle* gh                              = grib_handle_of_accessor(a);
 
     self->ieee_floats                         = grib_arguments_get_name(gh, args, self->carg++);
@@ -178,17 +42,15 @@ static void init(grib_accessor* a, const long v, grib_arguments* args)
     self->dirty = 1;
 }
 
-static int value_count(grib_accessor* a, long* numberOfValues)
-{
-    grib_accessor_data_g2bifourier_packing* self = (grib_accessor_data_g2bifourier_packing*)a;
+int grib_accessor_class_data_g2bifourier_packing_t::value_count(grib_accessor* a, long* numberOfValues){
+    grib_accessor_data_g2bifourier_packing_t* self = (grib_accessor_data_g2bifourier_packing_t*)a;
     grib_handle* gh                              = grib_handle_of_accessor(a);
     *numberOfValues                              = 0;
 
     return grib_get_long_internal(gh, self->number_of_values, numberOfValues);
 }
 
-static void ellipse(long ni, long nj, long itrunc[], long jtrunc[])
-{
+void ellipse(long ni, long nj, long itrunc[], long jtrunc[]){
     const double zeps   = 1.E-10;
     const double zauxil = 0.;
     int i, j;
@@ -229,8 +91,7 @@ static void ellipse(long ni, long nj, long itrunc[], long jtrunc[])
     }
 }
 
-static void rectangle(long ni, long nj, long itrunc[], long jtrunc[])
-{
+void rectangle(long ni, long nj, long itrunc[], long jtrunc[]){
     int i, j;
 
     /*
@@ -248,8 +109,7 @@ static void rectangle(long ni, long nj, long itrunc[], long jtrunc[])
         jtrunc[i] = nj;
 }
 
-static void diamond(long ni, long nj, long itrunc[], long jtrunc[])
-{
+void diamond(long ni, long nj, long itrunc[], long jtrunc[]){
     int i, j;
 
     if (nj == 0)
@@ -311,8 +171,7 @@ typedef struct bif_trunc_t
 /*
  * Total number of coefficients
  */
-static size_t size_bif(bif_trunc_t* bt)
-{
+size_t size_bif(bif_trunc_t* bt){
     size_t n_vals = 0;
     int j;
     for (j = 0; j <= bt->bif_j; j++)
@@ -323,8 +182,7 @@ static size_t size_bif(bif_trunc_t* bt)
 /*
  * Number of unpacked coefficients
  */
-static size_t size_sub(bif_trunc_t* bt)
-{
+size_t size_sub(bif_trunc_t* bt){
     size_t n_vals = 0;
     int i, j;
     for_ij()
@@ -339,8 +197,7 @@ static size_t size_sub(bif_trunc_t* bt)
     return n_vals;
 }
 
-static double laplam(bif_trunc_t* bt, const double val[])
-{
+double laplam(bif_trunc_t* bt, const double val[]){
     /*
      * For bi-Fourier spectral fields, the Laplacian operator is a multiplication by (i*i+j*j)
      */
@@ -476,8 +333,7 @@ static double laplam(bif_trunc_t* bt, const double val[])
     return zp;
 }
 
-static void free_bif_trunc(bif_trunc_t* bt, grib_accessor* a)
-{
+void free_bif_trunc(bif_trunc_t* bt, grib_accessor* a){
     grib_handle* gh = grib_handle_of_accessor(a);
     if (bt == NULL)
         return;
@@ -496,7 +352,7 @@ static void free_bif_trunc(bif_trunc_t* bt, grib_accessor* a)
 static bif_trunc_t* new_bif_trunc(grib_accessor* a)
 {
     int ret;
-    grib_accessor_data_g2bifourier_packing* self = (grib_accessor_data_g2bifourier_packing*)a;
+    grib_accessor_data_g2bifourier_packing_t* self = (grib_accessor_data_g2bifourier_packing_t*)a;
 
     grib_handle* gh = grib_handle_of_accessor(a);
     bif_trunc_t* bt = (bif_trunc_t*)grib_context_malloc(gh->context, sizeof(bif_trunc_t));
@@ -607,9 +463,8 @@ cleanup:
     return NULL;
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_data_g2bifourier_packing* self = (grib_accessor_data_g2bifourier_packing*)a;
+int grib_accessor_class_data_g2bifourier_packing_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_data_g2bifourier_packing_t* self = (grib_accessor_data_g2bifourier_packing_t*)a;
     grib_handle* gh                              = grib_handle_of_accessor(a);
 
     unsigned char* buf  = NULL;
@@ -633,7 +488,7 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     int ret  = GRIB_SUCCESS;
     int i, j, k;
 
-    if ((ret = grib_value_count(a, &count)) != GRIB_SUCCESS)
+    if ((ret = a->value_count(&count)) != GRIB_SUCCESS)
         goto cleanup;
 
     bt = new_bif_trunc(a);
@@ -659,8 +514,7 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     self->dirty = 0;
 
     buf = (unsigned char*)gh->buffer->data;
-    buf += grib_byte_offset(a);
-
+    buf += a->byte_offset();
     s = codes_power<double>(bt->binary_scale_factor, 2);
     d = codes_power<double>(-bt->decimal_scale_factor, 10);
 
@@ -670,7 +524,7 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     hres = buf;
     lres = buf;
 
-    packed_offset = grib_byte_offset(a) + bt->bytes * bt->n_vals_sub;
+    packed_offset = a->byte_offset() + bt->bytes * bt->n_vals_sub;
 
     lpos = 8 * (packed_offset - offsetdata);
     hpos = 0;
@@ -706,9 +560,8 @@ cleanup:
     return ret;
 }
 
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_data_g2bifourier_packing* self = (grib_accessor_data_g2bifourier_packing*)a;
+int grib_accessor_class_data_g2bifourier_packing_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_data_g2bifourier_packing_t* self = (grib_accessor_data_g2bifourier_packing_t*)a;
     grib_handle* gh                              = grib_handle_of_accessor(a);
     const char* cclass_name                      = a->cclass->name;
 
diff --git a/src/accessor/grib_accessor_class_data_g2bifourier_packing.h b/src/accessor/grib_accessor_class_data_g2bifourier_packing.h
new file mode 100644
index 000000000..f4033a1ba
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_g2bifourier_packing.h
@@ -0,0 +1,47 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_g2bifourier_packing_h
+#define eccodes_accessor_data_g2bifourier_packing_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_data_simple_packing.h"
+
+class grib_accessor_data_g2bifourier_packing_t : public grib_accessor_data_simple_packing_t
+{
+public:
+    /* Members defined in data_g2bifourier_packing */
+    const char*  ieee_floats;
+    const char*  laplacianOperatorIsSet;
+    const char*  laplacianOperator;
+    const char*  biFourierTruncationType;
+    const char*  sub_i;
+    const char*  sub_j;
+    const char*  bif_i;
+    const char*  bif_j;
+    const char*  biFourierSubTruncationType;
+    const char*  biFourierDoNotPackAxes;
+    const char*  biFourierMakeTemplate;
+    const char*  totalNumberOfValuesInUnpackedSubset;
+    const char*  numberOfValues;
+};
+
+class grib_accessor_class_data_g2bifourier_packing_t : public grib_accessor_class_data_simple_packing_t
+{
+public:
+    grib_accessor_class_data_g2bifourier_packing_t(const char* name) : grib_accessor_class_data_simple_packing_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_g2bifourier_packing_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_data_g2bifourier_packing_h */
diff --git a/src/accessor/grib_accessor_class_data_g2complex_packing.cc b/src/accessor/grib_accessor_class_data_g2complex_packing.cc
new file mode 100644
index 000000000..28958de56
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_g2complex_packing.cc
@@ -0,0 +1,47 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_data_g2complex_packing.h"
+
+grib_accessor_class_data_g2complex_packing_t _grib_accessor_class_data_g2complex_packing{"data_g2complex_packing"};
+grib_accessor_class* grib_accessor_class_data_g2complex_packing = &_grib_accessor_class_data_g2complex_packing;
+
+
+void grib_accessor_class_data_g2complex_packing_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    grib_accessor_data_g2complex_packing_t* self = (grib_accessor_data_g2complex_packing_t*)a;
+    self->numberOfValues                       = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
+    self->edition                              = 2;
+
+    a->flags |= GRIB_ACCESSOR_FLAG_DATA;
+}
+
+int grib_accessor_class_data_g2complex_packing_t::value_count(grib_accessor* a, long* numberOfValues){
+    grib_accessor_data_g2complex_packing_t* self = (grib_accessor_data_g2complex_packing_t*)a;
+    *numberOfValues                            = 0;
+
+    return grib_get_long(grib_handle_of_accessor(a), self->numberOfValues, numberOfValues);
+}
+
+int grib_accessor_class_data_g2complex_packing_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_data_g2complex_packing_t* self = (grib_accessor_data_g2complex_packing_t*)a;
+    int ret                                    = GRIB_SUCCESS;
+
+    if (*len == 0)
+        return GRIB_NO_VALUES;
+
+    ret = grib_accessor_class_data_complex_packing_t::pack_double(a, val, len);
+
+    if (ret == GRIB_SUCCESS)
+        ret = grib_set_long_internal(grib_handle_of_accessor(a), self->numberOfValues, *len);
+
+    return ret;
+}
diff --git a/src/accessor/grib_accessor_class_data_g2complex_packing.h b/src/accessor/grib_accessor_class_data_g2complex_packing.h
new file mode 100644
index 000000000..e77b89276
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_g2complex_packing.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_g2complex_packing_h
+#define eccodes_accessor_data_g2complex_packing_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_data_complex_packing.h"
+
+class grib_accessor_data_g2complex_packing_t : public grib_accessor_data_complex_packing_t
+{
+public:
+    /* Members defined in data_g2complex_packing */
+    const char*  numberOfValues;
+};
+
+class grib_accessor_class_data_g2complex_packing_t : public grib_accessor_class_data_complex_packing_t
+{
+public:
+    grib_accessor_class_data_g2complex_packing_t(const char* name) : grib_accessor_class_data_complex_packing_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_g2complex_packing_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_data_g2complex_packing_h */
diff --git a/src/accessor/grib_accessor_class_data_g2secondary_bitmap.cc b/src/accessor/grib_accessor_class_data_g2secondary_bitmap.cc
new file mode 100644
index 000000000..bce04078b
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_g2secondary_bitmap.cc
@@ -0,0 +1,107 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_data_g2secondary_bitmap.h"
+
+grib_accessor_class_data_g2secondary_bitmap_t _grib_accessor_class_data_g2secondary_bitmap{"data_g2secondary_bitmap"};
+grib_accessor_class* grib_accessor_class_data_g2secondary_bitmap = &_grib_accessor_class_data_g2secondary_bitmap;
+
+
+void grib_accessor_class_data_g2secondary_bitmap_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    grib_accessor_data_g2secondary_bitmap_t* self = (grib_accessor_data_g2secondary_bitmap_t*)a;
+    self->number_of_values = grib_arguments_get_name(grib_handle_of_accessor(a), args, 4);
+}
+
+int grib_accessor_class_data_g2secondary_bitmap_t::value_count(grib_accessor* a, long* len){
+    grib_accessor_data_g2secondary_bitmap_t* self = (grib_accessor_data_g2secondary_bitmap_t*)a;
+    *len = 0;
+    return grib_get_long_internal(grib_handle_of_accessor(a), self->number_of_values, len);
+}
+
+int grib_accessor_class_data_g2secondary_bitmap_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_data_g2secondary_bitmap_t* self = (grib_accessor_data_g2secondary_bitmap_t*)a;
+    int err = 0;
+
+    long primary_len = 0, secondary_len = 0;
+    double* primary_bitmap   = NULL;
+    double* secondary_bitmap = NULL;
+    long i = 0, j = 0, k = 0, m = 0;
+    double missing_value = 0, present_value = 0;
+    long expand_by = 0;
+
+    if (*len == 0)
+        return GRIB_NO_VALUES;
+
+    if ((err = grib_get_long(grib_handle_of_accessor(a), self->expand_by, &expand_by)) != GRIB_SUCCESS)
+        return err;
+    if (expand_by <= 0)
+        return GRIB_ENCODING_ERROR;
+
+    if ((err = grib_get_double_internal(grib_handle_of_accessor(a), self->missing_value, &missing_value)) != GRIB_SUCCESS)
+        return err;
+
+    if (*len % expand_by) {
+        /*TODO: issue warning */
+        return GRIB_ENCODING_ERROR;
+    }
+
+    primary_len    = *len / expand_by;
+    primary_bitmap = (double*)grib_context_malloc_clear(a->context, primary_len * sizeof(double));
+    if (!primary_bitmap)
+        return GRIB_OUT_OF_MEMORY;
+
+    secondary_len    = *len;
+    secondary_bitmap = (double*)grib_context_malloc_clear(a->context, secondary_len * sizeof(double));
+    if (!secondary_bitmap) {
+        grib_context_free(a->context, primary_bitmap);
+        return GRIB_OUT_OF_MEMORY;
+    }
+
+    if (missing_value == 0)
+        present_value = 1;
+    else
+        present_value = 0;
+
+    k = 0;
+    m = 0;
+    for (i = 0; i < *len; i += expand_by) {
+        int cnt = 0;
+        for (j = 0; j < expand_by; j++)
+            if (val[i + j] == missing_value)
+                cnt++;
+
+        if (cnt == expand_by) /* all expand_by values are missing */
+            primary_bitmap[k++] = missing_value;
+        else {
+            primary_bitmap[k++] = present_value;
+            for (j = 0; j < expand_by; j++)
+                secondary_bitmap[m++] = val[i + j];
+            //on++;
+        }
+    }
+
+    *len = k;
+
+    Assert(k == primary_len);
+
+    err = grib_set_double_array_internal(grib_handle_of_accessor(a), self->primary_bitmap, primary_bitmap, k);
+    if (err == GRIB_SUCCESS)
+        err = grib_set_double_array_internal(grib_handle_of_accessor(a), self->secondary_bitmap, secondary_bitmap, m);
+
+    grib_context_free(a->context, primary_bitmap);
+    grib_context_free(a->context, secondary_bitmap);
+
+    if (err == GRIB_SUCCESS)
+        err = grib_set_long_internal(grib_handle_of_accessor(a), self->number_of_values, *len * expand_by);
+
+    return err;
+}
diff --git a/src/accessor/grib_accessor_class_data_g2secondary_bitmap.h b/src/accessor/grib_accessor_class_data_g2secondary_bitmap.h
new file mode 100644
index 000000000..394c79bfa
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_g2secondary_bitmap.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_g2secondary_bitmap_h
+#define eccodes_accessor_data_g2secondary_bitmap_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_data_secondary_bitmap.h"
+
+class grib_accessor_data_g2secondary_bitmap_t : public grib_accessor_data_secondary_bitmap_t
+{
+public:
+    /* Members defined in data_g2secondary_bitmap */
+    const char*  number_of_values;
+};
+
+class grib_accessor_class_data_g2secondary_bitmap_t : public grib_accessor_class_data_secondary_bitmap_t
+{
+public:
+    grib_accessor_class_data_g2secondary_bitmap_t(const char* name) : grib_accessor_class_data_secondary_bitmap_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_g2secondary_bitmap_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_data_g2secondary_bitmap_h */
diff --git a/src/accessor/grib_accessor_class_data_g2shsimple_packing.cc b/src/accessor/grib_accessor_class_data_g2shsimple_packing.cc
new file mode 100644
index 000000000..e765539ee
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_g2shsimple_packing.cc
@@ -0,0 +1,92 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_data_g2shsimple_packing.h"
+
+grib_accessor_class_data_g2shsimple_packing_t _grib_accessor_class_data_g2shsimple_packing{"data_g2shsimple_packing"};
+grib_accessor_class* grib_accessor_class_data_g2shsimple_packing = &_grib_accessor_class_data_g2shsimple_packing;
+
+
+void grib_accessor_class_data_g2shsimple_packing_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    grib_accessor_data_g2shsimple_packing_t* self = (grib_accessor_data_g2shsimple_packing_t*)a;
+
+    self->numberOfValues     = grib_arguments_get_name(grib_handle_of_accessor(a), args, 2);
+    self->numberOfDataPoints = grib_arguments_get_name(grib_handle_of_accessor(a), args, 3);
+    a->flags |= GRIB_ACCESSOR_FLAG_DATA;
+}
+
+int grib_accessor_class_data_g2shsimple_packing_t::value_count(grib_accessor* a, long* len){
+    grib_accessor_data_g2shsimple_packing_t* self = (grib_accessor_data_g2shsimple_packing_t*)a;
+    *len                                        = 0;
+    return grib_get_long(grib_handle_of_accessor(a), self->numberOfValues, len);
+}
+
+int grib_accessor_class_data_g2shsimple_packing_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_data_g2shsimple_packing_t* self = (grib_accessor_data_g2shsimple_packing_t*)a;
+    int err                                     = GRIB_SUCCESS;
+
+    size_t n_vals = 0;
+
+    if ((err = grib_get_size(grib_handle_of_accessor(a), self->coded_values, &n_vals)) != GRIB_SUCCESS)
+        return err;
+
+    self->dirty = 0;
+
+    /* n_vals = coded_n_vals+1; */
+
+    if (*len < n_vals) {
+        *len = n_vals;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    if ((err = grib_get_double_internal(grib_handle_of_accessor(a), self->real_part, val)) != GRIB_SUCCESS)
+        return err;
+
+    val++;
+
+    if ((err = grib_get_double_array_internal(grib_handle_of_accessor(a), self->coded_values, val, &n_vals)) != GRIB_SUCCESS)
+        return err;
+
+    *len = n_vals;
+
+    return err;
+}
+
+int grib_accessor_class_data_g2shsimple_packing_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_data_g2shsimple_packing_t* self = (grib_accessor_data_g2shsimple_packing_t*)a;
+    int err                                     = GRIB_SUCCESS;
+
+    size_t coded_n_vals = *len - 1;
+    size_t n_vals       = *len;
+
+    if (*len == 0)
+        return GRIB_NO_VALUES;
+
+    self->dirty = 1;
+
+    if ((err = grib_set_double_internal(grib_handle_of_accessor(a), self->real_part, *val)) != GRIB_SUCCESS)
+        return err;
+
+    val++;
+
+    if ((err = grib_set_double_array_internal(grib_handle_of_accessor(a), self->coded_values, val, coded_n_vals)) != GRIB_SUCCESS)
+        return err;
+
+    *len = n_vals;
+
+    if ((err = grib_set_long_internal(grib_handle_of_accessor(a), self->numberOfValues, (long)n_vals)) != GRIB_SUCCESS)
+        return err;
+    if ((err = grib_set_long_internal(grib_handle_of_accessor(a), self->numberOfDataPoints, (long)n_vals)) != GRIB_SUCCESS)
+        return err;
+
+    return err;
+}
diff --git a/src/accessor/grib_accessor_class_data_g2shsimple_packing.h b/src/accessor/grib_accessor_class_data_g2shsimple_packing.h
new file mode 100644
index 000000000..28e7a7c06
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_g2shsimple_packing.h
@@ -0,0 +1,36 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_g2shsimple_packing_h
+#define eccodes_accessor_data_g2shsimple_packing_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_data_shsimple_packing.h"
+
+class grib_accessor_data_g2shsimple_packing_t : public grib_accessor_data_shsimple_packing_t
+{
+public:
+    /* Members defined in data_g2shsimple_packing */
+    const char*  numberOfValues;
+    const char*  numberOfDataPoints;
+};
+
+class grib_accessor_class_data_g2shsimple_packing_t : public grib_accessor_class_data_shsimple_packing_t
+{
+public:
+    grib_accessor_class_data_g2shsimple_packing_t(const char* name) : grib_accessor_class_data_shsimple_packing_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_g2shsimple_packing_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_data_g2shsimple_packing_h */
diff --git a/src/accessor/todo/grib_accessor_class_data_g2simple_packing.cc b/src/accessor/grib_accessor_class_data_g2simple_packing.cc
similarity index 51%
rename from src/accessor/todo/grib_accessor_class_data_g2simple_packing.cc
rename to src/accessor/grib_accessor_class_data_g2simple_packing.cc
index 56441fc96..051239cbc 100644
--- a/src/accessor/todo/grib_accessor_class_data_g2simple_packing.cc
+++ b/src/accessor/grib_accessor_class_data_g2simple_packing.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,135 +9,29 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-#include "grib_scaling.h"
 #include "grib_api_internal.h"
+#include "grib_accessor_class_data_g2simple_packing.h"
+#include "grib_scaling.h"
 
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_data_simple_packing
-   IMPLEMENTS = init
-   IMPLEMENTS = pack_double
-   IMPLEMENTS = pack_bytes
-   IMPLEMENTS = value_count
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_bytes(grib_accessor*, const unsigned char*, size_t* len);
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_data_g2simple_packing
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in values */
-    int  carg;
-    const char* seclen;
-    const char* offsetdata;
-    const char* offsetsection;
-    int dirty;
-    /* Members defined in data_simple_packing */
-    int edition;
-    const char*  units_factor;
-    const char*  units_bias;
-    const char*  changing_precision;
-    const char*  number_of_values;
-    const char*  bits_per_value;
-    const char*  reference_value;
-    const char*  binary_scale_factor;
-    const char*  decimal_scale_factor;
-    const char*  optimize_scaling_factor;
-    /* Members defined in data_g2simple_packing */
-} grib_accessor_data_g2simple_packing;
-
-extern grib_accessor_class* grib_accessor_class_data_simple_packing;
-
-static grib_accessor_class _grib_accessor_class_data_g2simple_packing = {
-    &grib_accessor_class_data_simple_packing,                      /* super */
-    "data_g2simple_packing",                      /* name */
-    sizeof(grib_accessor_data_g2simple_packing),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    &pack_bytes,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
+grib_accessor_class_data_g2simple_packing_t _grib_accessor_class_data_g2simple_packing{"data_g2simple_packing"};
 grib_accessor_class* grib_accessor_class_data_g2simple_packing = &_grib_accessor_class_data_g2simple_packing;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    grib_accessor_data_g2simple_packing* self = (grib_accessor_data_g2simple_packing*)a;
+void grib_accessor_class_data_g2simple_packing_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    grib_accessor_data_g2simple_packing_t* self = (grib_accessor_data_g2simple_packing_t*)a;
     a->flags |= GRIB_ACCESSOR_FLAG_DATA;
     self->edition = 2;
 }
 
-static int value_count(grib_accessor* a, long* n_vals)
-{
-    grib_accessor_data_g2simple_packing* self = (grib_accessor_data_g2simple_packing*)a;
+int grib_accessor_class_data_g2simple_packing_t::value_count(grib_accessor* a, long* n_vals){
+    grib_accessor_data_g2simple_packing_t* self = (grib_accessor_data_g2simple_packing_t*)a;
     *n_vals                                   = 0;
     return grib_get_long_internal(grib_handle_of_accessor(a), self->number_of_values, n_vals);
 }
 
-static int pack_double(grib_accessor* a, const double* cval, size_t* len)
-{
-    grib_accessor_data_g2simple_packing* self = (grib_accessor_data_g2simple_packing*)a;
-    grib_accessor_class* super                = *(a->cclass->super);
+int grib_accessor_class_data_g2simple_packing_t::pack_double(grib_accessor* a, const double* cval, size_t* len){
+    grib_accessor_data_g2simple_packing_t* self = (grib_accessor_data_g2simple_packing_t*)a;
+    //grib_accessor_class* super                = *(a->cclass->super);
     size_t n_vals                             = *len;
     double reference_value                    = 0;
     long binary_scale_factor                  = 0;
@@ -209,17 +104,20 @@ static int pack_double(grib_accessor* a, const double* cval, size_t* len)
         return grib_set_double_array(h, "values", val, *len);
     }
 
-    if (super != grib_accessor_class_data_g2simple_packing) {
-        /* Normal case: parent not same as me! */
-        ret = super->pack_double(a, val, len);
-    }
-    else {
-        /* GRIB-364: simple packing with logarithm pre-processing */
-        grib_accessor_class* super2 = NULL;
-        Assert(super->super);
-        super2 = *(super->super);
-        ret    = super2->pack_double(a, val, len);
-    }
+    // ==== TODO(maee): Fix this ====
+    ret = grib_accessor_class_data_simple_packing_t::pack_double(a, cval, len);
+    //if (super != grib_accessor_class_data_g2simple_packing) {
+    //    [> Normal case: parent not same as me! <]
+    //    ret = super->pack_double(a, val, len);
+    //}
+    //else {
+    //    [> GRIB-364: simple packing with logarithm pre-processing <]
+    //    grib_accessor_class* super2 = NULL;
+    //    Assert(super->super);
+    //    super2 = *(super->super);
+    //    ret    = super2->pack_double(a, val, len);
+    //}
+    // =============================
     switch (ret) {
         case GRIB_CONSTANT_FIELD:
             grib_buffer_replace(a, NULL, 0, 1, 1);
@@ -253,7 +151,7 @@ static int pack_double(grib_accessor* a, const double* cval, size_t* len)
     grib_encode_double_array(n_vals, val, bits_per_value, reference_value, decimal, divisor, encoded, &off);
 
     grib_context_log(a->context, GRIB_LOG_DEBUG,
-                     "grib_accessor_data_g2simple_packing : pack_double : packing %s, %d values", a->name, n_vals);
+                     "grib_accessor_data_g2simple_packing_t : pack_double : packing %s, %d values", a->name, n_vals);
 
     grib_buffer_replace(a, buf, buflen, 1, 1);
 
@@ -262,8 +160,7 @@ static int pack_double(grib_accessor* a, const double* cval, size_t* len)
     return ret;
 }
 
-static int pack_bytes(grib_accessor* a, const unsigned char* val, size_t* len)
-{
+int grib_accessor_class_data_g2simple_packing_t::pack_bytes(grib_accessor* a, const unsigned char* val, size_t* len){
     size_t length = *len;
     grib_buffer_replace(a, val, length, 1, 1);
     return GRIB_SUCCESS;
diff --git a/src/accessor/grib_accessor_class_data_g2simple_packing.h b/src/accessor/grib_accessor_class_data_g2simple_packing.h
new file mode 100644
index 000000000..b3982c40d
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_g2simple_packing.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_g2simple_packing_h
+#define eccodes_accessor_data_g2simple_packing_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_data_simple_packing.h"
+
+class grib_accessor_data_g2simple_packing_t : public grib_accessor_data_simple_packing_t
+{
+public:
+    /* Members defined in data_g2simple_packing */
+};
+
+class grib_accessor_class_data_g2simple_packing_t : public grib_accessor_class_data_simple_packing_t
+{
+public:
+    grib_accessor_class_data_g2simple_packing_t(const char* name) : grib_accessor_class_data_simple_packing_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_g2simple_packing_t{}; }
+    int pack_bytes(grib_accessor*, const unsigned char*, size_t* len) override;
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_data_g2simple_packing_h */
diff --git a/src/accessor/grib_accessor_class_data_g2simple_packing_with_preprocessing.cc b/src/accessor/grib_accessor_class_data_g2simple_packing_with_preprocessing.cc
new file mode 100644
index 000000000..21493c113
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_g2simple_packing_with_preprocessing.cc
@@ -0,0 +1,179 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_data_g2simple_packing_with_preprocessing.h"
+#define DIRECT  0
+#define INVERSE 1
+
+grib_accessor_class_data_g2simple_packing_with_preprocessing_t _grib_accessor_class_data_g2simple_packing_with_preprocessing{"data_g2simple_packing_with_preprocessing"};
+grib_accessor_class* grib_accessor_class_data_g2simple_packing_with_preprocessing = &_grib_accessor_class_data_g2simple_packing_with_preprocessing;
+
+
+void grib_accessor_class_data_g2simple_packing_with_preprocessing_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    grib_accessor_data_g2simple_packing_with_preprocessing_t* self = (grib_accessor_data_g2simple_packing_with_preprocessing_t*)a;
+    self->pre_processing           = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
+    self->pre_processing_parameter = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
+    a->flags |= GRIB_ACCESSOR_FLAG_DATA;
+}
+
+int grib_accessor_class_data_g2simple_packing_with_preprocessing_t::value_count(grib_accessor* a, long* n_vals){
+    grib_accessor_data_g2simple_packing_with_preprocessing_t* self = (grib_accessor_data_g2simple_packing_with_preprocessing_t*)a;
+    *n_vals = 0;
+
+    return grib_get_long_internal(grib_handle_of_accessor(a), self->number_of_values, n_vals);
+}
+
+static int pre_processing_func(double* values, long length, long pre_processing,
+                               double* pre_processing_parameter, int mode)
+{
+    int i = 0, ret  = 0;
+    double min      = values[0];
+    double next_min = values[0];
+    Assert(length > 0);
+
+    switch (pre_processing) {
+        /* NONE */
+        case 0:
+            break;
+        /* LOGARITHM */
+        case 1:
+            if (mode == DIRECT) {
+                for (i = 0; i < length; i++) {
+                    if (values[i] < min)
+                        min = values[i];
+                    if (values[i] > next_min)
+                        next_min = values[i];
+                }
+                for (i = 0; i < length; i++) {
+                    if (values[i] > min && values[i] < next_min)
+                        next_min = values[i];
+                }
+                if (min > 0) {
+                    *pre_processing_parameter = 0;
+                    for (i = 0; i < length; i++) {
+                        DEBUG_ASSERT(values[i] > 0);
+                        values[i] = log(values[i]);
+                    }
+                }
+                else {
+                    double ppp                = 0;
+                    *pre_processing_parameter = next_min - 2 * min;
+                    if (next_min == min)
+                        return ret;
+                    ppp = *pre_processing_parameter;
+                    for (i = 0; i < length; i++) {
+                        DEBUG_ASSERT((values[i] + ppp) > 0);
+                        values[i] = log(values[i] + ppp);
+                    }
+                }
+            }
+            else {
+                Assert(mode == INVERSE);
+                if (*pre_processing_parameter == 0) {
+                    for (i = 0; i < length; i++)
+                        values[i] = exp(values[i]);
+                }
+                else {
+                    for (i = 0; i < length; i++)
+                        values[i] = exp(values[i]) - *pre_processing_parameter;
+                }
+            }
+            break;
+        default:
+            ret = GRIB_NOT_IMPLEMENTED;
+            break;
+    }
+
+    return ret;
+}
+
+int grib_accessor_class_data_g2simple_packing_with_preprocessing_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_data_g2simple_packing_with_preprocessing_t* self = (grib_accessor_data_g2simple_packing_with_preprocessing_t*)a;
+    //grib_accessor_class* super  = *(a->cclass->super);
+    //grib_accessor_class* super2 = NULL;
+
+    size_t n_vals = 0;
+    long nn       = 0;
+    int err       = 0;
+
+    long pre_processing;
+    double pre_processing_parameter;
+
+    err    = a->value_count(&nn);    n_vals = nn;
+    if (err)
+        return err;
+
+    if (n_vals == 0) {
+        *len = 0;
+        return GRIB_SUCCESS;
+    }
+
+    self->dirty = 0;
+
+    if ((err = grib_get_long_internal(grib_handle_of_accessor(a), self->pre_processing, &pre_processing)) != GRIB_SUCCESS) {
+        return err;
+    }
+
+    if ((err = grib_get_double_internal(grib_handle_of_accessor(a), self->pre_processing_parameter, &pre_processing_parameter)) != GRIB_SUCCESS) {
+        return err;
+    }
+
+    // TODO(maee): fix this
+    //Assert(super->super);
+    //super2 = *(super->super);
+    //err    = super2->unpack_double(a, val, &n_vals); [> GRIB-364 <]
+    err = grib_accessor_class_data_simple_packing_t::unpack_double(a, val, &n_vals);
+    if (err != GRIB_SUCCESS)
+        return err;
+
+    err = pre_processing_func(val, n_vals, pre_processing, &pre_processing_parameter, INVERSE);
+    if (err != GRIB_SUCCESS)
+        return err;
+
+    *len = (long)n_vals;
+
+    return err;
+}
+
+int grib_accessor_class_data_g2simple_packing_with_preprocessing_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_data_g2simple_packing_with_preprocessing_t* self = (grib_accessor_data_g2simple_packing_with_preprocessing_t*)a;
+    //grib_accessor_class* super                                   = *(a->cclass->super);
+
+    size_t n_vals = *len;
+    int err       = 0;
+
+    long pre_processing             = 0;
+    double pre_processing_parameter = 0;
+
+    self->dirty = 1;
+
+    if ((err = grib_get_long_internal(grib_handle_of_accessor(a), self->pre_processing, &pre_processing)) != GRIB_SUCCESS)
+        return err;
+
+    err = pre_processing_func((double*)val, n_vals, pre_processing, &pre_processing_parameter, DIRECT);
+    if (err != GRIB_SUCCESS)
+        return err;
+
+    // TOOD(maee): fix this
+    //err = super->pack_double(a, val, len);
+    err = grib_accessor_class_data_g2simple_packing_t::pack_double(a, val, len);
+    if (err != GRIB_SUCCESS)
+        return err;
+
+    if ((err = grib_set_double_internal(grib_handle_of_accessor(a), self->pre_processing_parameter, pre_processing_parameter)) != GRIB_SUCCESS)
+        return err;
+
+    if ((err = grib_set_long_internal(grib_handle_of_accessor(a), self->number_of_values, n_vals)) != GRIB_SUCCESS)
+        return err;
+
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_data_g2simple_packing_with_preprocessing.h b/src/accessor/grib_accessor_class_data_g2simple_packing_with_preprocessing.h
new file mode 100644
index 000000000..ac2bc2d27
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_g2simple_packing_with_preprocessing.h
@@ -0,0 +1,36 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_g2simple_packing_with_preprocessing_h
+#define eccodes_accessor_data_g2simple_packing_with_preprocessing_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_data_g2simple_packing.h"
+
+class grib_accessor_data_g2simple_packing_with_preprocessing_t : public grib_accessor_data_g2simple_packing_t
+{
+public:
+    /* Members defined in data_g2simple_packing_with_preprocessing */
+    const char*  pre_processing;
+    const char*  pre_processing_parameter;
+};
+
+class grib_accessor_class_data_g2simple_packing_with_preprocessing_t : public grib_accessor_class_data_g2simple_packing_t
+{
+public:
+    grib_accessor_class_data_g2simple_packing_with_preprocessing_t(const char* name) : grib_accessor_class_data_g2simple_packing_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_g2simple_packing_with_preprocessing_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_data_g2simple_packing_with_preprocessing_h */
diff --git a/src/accessor/todo/grib_accessor_class_data_jpeg2000_packing.cc b/src/accessor/grib_accessor_class_data_jpeg2000_packing.cc
similarity index 73%
rename from src/accessor/todo/grib_accessor_class_data_jpeg2000_packing.cc
rename to src/accessor/grib_accessor_class_data_jpeg2000_packing.cc
index a1a43b6f7..d5f3eaaf4 100644
--- a/src/accessor/todo/grib_accessor_class_data_jpeg2000_packing.cc
+++ b/src/accessor/grib_accessor_class_data_jpeg2000_packing.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,148 +9,21 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-#include "grib_scaling.h"
 #include "grib_api_internal.h"
+#include "grib_accessor_class_data_jpeg2000_packing.h"
 
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_data_simple_packing
-   IMPLEMENTS = init
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = pack_double;unpack_float
-   IMPLEMENTS = unpack_double_element;unpack_double_element_set
-   IMPLEMENTS = value_count
-   MEMBERS=const char*   type_of_compression_used
-   MEMBERS=const char*   target_compression_ratio
-   MEMBERS=const char*   ni
-   MEMBERS=const char*   nj
-   MEMBERS=const char*   list_defining_points
-   MEMBERS=const char*   number_of_data_points
-   MEMBERS=const char*   scanning_mode
-   MEMBERS=int jpeg_lib
-   MEMBERS=const char*   dump_jpg
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_float(grib_accessor*, float* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static int unpack_double_element(grib_accessor*, size_t i, double* val);
-static int unpack_double_element_set(grib_accessor*, const size_t* index_array, size_t len, double* val_array);
-
-typedef struct grib_accessor_data_jpeg2000_packing
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in values */
-    int  carg;
-    const char* seclen;
-    const char* offsetdata;
-    const char* offsetsection;
-    int dirty;
-    /* Members defined in data_simple_packing */
-    int edition;
-    const char*  units_factor;
-    const char*  units_bias;
-    const char*  changing_precision;
-    const char*  number_of_values;
-    const char*  bits_per_value;
-    const char*  reference_value;
-    const char*  binary_scale_factor;
-    const char*  decimal_scale_factor;
-    const char*  optimize_scaling_factor;
-    /* Members defined in data_jpeg2000_packing */
-    const char*   type_of_compression_used;
-    const char*   target_compression_ratio;
-    const char*   ni;
-    const char*   nj;
-    const char*   list_defining_points;
-    const char*   number_of_data_points;
-    const char*   scanning_mode;
-    int jpeg_lib;
-    const char*   dump_jpg;
-} grib_accessor_data_jpeg2000_packing;
-
-extern grib_accessor_class* grib_accessor_class_data_simple_packing;
-
-static grib_accessor_class _grib_accessor_class_data_jpeg2000_packing = {
-    &grib_accessor_class_data_simple_packing,                      /* super */
-    "data_jpeg2000_packing",                      /* name */
-    sizeof(grib_accessor_data_jpeg2000_packing),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    &unpack_float,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    &unpack_double_element,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    &unpack_double_element_set,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
+grib_accessor_class_data_jpeg2000_packing_t _grib_accessor_class_data_jpeg2000_packing{"data_jpeg2000_packing"};
 grib_accessor_class* grib_accessor_class_data_jpeg2000_packing = &_grib_accessor_class_data_jpeg2000_packing;
 
-/* END_CLASS_IMP */
 
 static int first = 1;
 
 #define JASPER_LIB 1
 #define OPENJPEG_LIB 2
 
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
+void grib_accessor_class_data_jpeg2000_packing_t::init(grib_accessor* a, const long v, grib_arguments* args){
     const char* user_lib                      = NULL;
-    grib_accessor_data_jpeg2000_packing* self = (grib_accessor_data_jpeg2000_packing*)a;
+    grib_accessor_data_jpeg2000_packing_t* self = (grib_accessor_data_jpeg2000_packing_t*)a;
     grib_handle* hand = grib_handle_of_accessor(a);
 
     self->jpeg_lib                 = 0;
@@ -204,9 +78,8 @@ static void init(grib_accessor* a, const long v, grib_arguments* args)
     }
 }
 
-static int value_count(grib_accessor* a, long* n_vals)
-{
-    grib_accessor_data_jpeg2000_packing* self = (grib_accessor_data_jpeg2000_packing*)a;
+int grib_accessor_class_data_jpeg2000_packing_t::value_count(grib_accessor* a, long* n_vals){
+    grib_accessor_data_jpeg2000_packing_t* self = (grib_accessor_data_jpeg2000_packing_t*)a;
     *n_vals                                   = 0;
 
     return grib_get_long_internal(grib_handle_of_accessor(a), self->number_of_values, n_vals);
@@ -215,19 +88,16 @@ static int value_count(grib_accessor* a, long* n_vals)
 #define EXTRA_BUFFER_SIZE 10240
 
 #if HAVE_JPEG
-static int unpack_float(grib_accessor*, float* val, size_t* len)
-{
+int grib_accessor_class_data_jpeg2000_packing_t::unpack_float(grib_accessor*, float* val, size_t* len){
     return GRIB_NOT_IMPLEMENTED;
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_data_jpeg2000_packing* self = (grib_accessor_data_jpeg2000_packing*)a;
+int grib_accessor_class_data_jpeg2000_packing_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_data_jpeg2000_packing_t* self = (grib_accessor_data_jpeg2000_packing_t*)a;
 
     int err = GRIB_SUCCESS;
     size_t i = 0;
-    size_t buflen = grib_byte_count(a);
-
+    size_t buflen = a->byte_count();
     double bscale      = 0;
     double dscale      = 0;
     unsigned char* buf = NULL;
@@ -242,8 +112,7 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     double units_bias         = 0.0;
 
     n_vals = 0;
-    err    = grib_value_count(a, &nn);
-    n_vals = nn;
+    err    = a->value_count(&nn);    n_vals = nn;
     if (err)
         return err;
 
@@ -282,8 +151,7 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     }
 
     buf = (unsigned char*)grib_handle_of_accessor(a)->buffer->data;
-    buf += grib_byte_offset(a);
-
+    buf += a->byte_offset();
     switch (self->jpeg_lib) {
         case OPENJPEG_LIB:
             if ((err = grib_openjpeg_decode(a->context, buf, &buflen, val, &n_vals)) != GRIB_SUCCESS)
@@ -323,9 +191,8 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     return err;
 }
 
-static int pack_double(grib_accessor* a, const double* cval, size_t* len)
-{
-    grib_accessor_data_jpeg2000_packing* self = (grib_accessor_data_jpeg2000_packing*)a;
+int grib_accessor_class_data_jpeg2000_packing_t::pack_double(grib_accessor* a, const double* cval, size_t* len){
+    grib_accessor_data_jpeg2000_packing_t* self = (grib_accessor_data_jpeg2000_packing_t*)a;
     grib_accessor_class* super                = *(a->cclass->super);
     size_t n_vals                             = *len;
     int err                                   = 0;
@@ -561,33 +428,28 @@ cleanup:
 }
 #else
 
-static void print_error_feature_not_enabled(grib_context* c)
-{
+void print_error_feature_not_enabled(grib_context* c){
     grib_context_log(c, GRIB_LOG_ERROR,
                      "JPEG support not enabled. Please rebuild with -DENABLE_JPG=ON");
 }
-static int unpack_float(grib_accessor* a, float* val, size_t* len)
-{
+int grib_accessor_class_data_jpeg2000_packing_t::unpack_float(grib_accessor* a, float* val, size_t* len){
     print_error_feature_not_enabled(a->context);
     return GRIB_FUNCTIONALITY_NOT_ENABLED;
 }
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
+int grib_accessor_class_data_jpeg2000_packing_t::unpack_double(grib_accessor* a, double* val, size_t* len){
     print_error_feature_not_enabled(a->context);
     return GRIB_FUNCTIONALITY_NOT_ENABLED;
 }
 
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
+int grib_accessor_class_data_jpeg2000_packing_t::pack_double(grib_accessor* a, const double* val, size_t* len){
     print_error_feature_not_enabled(a->context);
     return GRIB_FUNCTIONALITY_NOT_ENABLED;
 }
 
 #endif
 
-static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
-{
-    grib_accessor_data_jpeg2000_packing* self = (grib_accessor_data_jpeg2000_packing*)a;
+int grib_accessor_class_data_jpeg2000_packing_t::unpack_double_element(grib_accessor* a, size_t idx, double* val){
+    grib_accessor_data_jpeg2000_packing_t* self = (grib_accessor_data_jpeg2000_packing_t*)a;
     grib_handle* hand = grib_handle_of_accessor(a);
     size_t size = 0;
     double* values = NULL;
@@ -624,9 +486,8 @@ static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
     return GRIB_SUCCESS;
 }
 
-static int unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array)
-{
-    grib_accessor_data_jpeg2000_packing* self = (grib_accessor_data_jpeg2000_packing*)a;
+int grib_accessor_class_data_jpeg2000_packing_t::unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array){
+    grib_accessor_data_jpeg2000_packing_t* self = (grib_accessor_data_jpeg2000_packing_t*)a;
     grib_handle* hand = grib_handle_of_accessor(a);
     size_t size = 0, i = 0;
     double* values = NULL;
diff --git a/src/accessor/grib_accessor_class_data_jpeg2000_packing.h b/src/accessor/grib_accessor_class_data_jpeg2000_packing.h
new file mode 100644
index 000000000..a04ee58d5
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_jpeg2000_packing.h
@@ -0,0 +1,46 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_jpeg2000_packing_h
+#define eccodes_accessor_data_jpeg2000_packing_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_data_simple_packing.h"
+
+class grib_accessor_data_jpeg2000_packing_t : public grib_accessor_data_simple_packing_t
+{
+public:
+    /* Members defined in data_jpeg2000_packing */
+    const char*   type_of_compression_used;
+    const char*   target_compression_ratio;
+    const char*   ni;
+    const char*   nj;
+    const char*   list_defining_points;
+    const char*   number_of_data_points;
+    const char*   scanning_mode;
+    int jpeg_lib;
+    const char*   dump_jpg;
+};
+
+class grib_accessor_class_data_jpeg2000_packing_t : public grib_accessor_class_data_simple_packing_t
+{
+public:
+    grib_accessor_class_data_jpeg2000_packing_t(const char* name) : grib_accessor_class_data_simple_packing_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_jpeg2000_packing_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_float(grib_accessor*, float* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    int unpack_double_element(grib_accessor*, size_t i, double* val) override;
+    int unpack_double_element_set(grib_accessor*, const size_t* index_array, size_t len, double* val_array) override;
+};
+#endif /* eccodes_accessor_data_jpeg2000_packing_h */
diff --git a/src/accessor/todo/grib_accessor_class_data_png_packing.cc b/src/accessor/grib_accessor_class_data_png_packing.cc
similarity index 75%
rename from src/accessor/todo/grib_accessor_class_data_png_packing.cc
rename to src/accessor/grib_accessor_class_data_png_packing.cc
index e9747b19d..8c1c62bb3 100644
--- a/src/accessor/todo/grib_accessor_class_data_png_packing.cc
+++ b/src/accessor/grib_accessor_class_data_png_packing.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,134 +9,15 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-#include "grib_scaling.h"
 #include "grib_api_internal.h"
-#define PNG_ANYBITS
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_values
-   IMPLEMENTS = init
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = pack_double
-   IMPLEMENTS = value_count
-   IMPLEMENTS = unpack_double_element;unpack_double_element_set
-   MEMBERS=const char*   number_of_values
-   MEMBERS=const char*   reference_value
-   MEMBERS=const char*   binary_scale_factor
-   MEMBERS=const char*   decimal_scale_factor
-   MEMBERS=const char*   bits_per_value
-   MEMBERS=const char*   ni
-   MEMBERS=const char*   nj
-   MEMBERS=const char*   list_defining_points
-   MEMBERS=const char*   number_of_data_points
-   MEMBERS=const char*   scanning_mode
-
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static int unpack_double_element(grib_accessor*, size_t i, double* val);
-static int unpack_double_element_set(grib_accessor*, const size_t* index_array, size_t len, double* val_array);
-
-typedef struct grib_accessor_data_png_packing
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in values */
-    int  carg;
-    const char* seclen;
-    const char* offsetdata;
-    const char* offsetsection;
-    int dirty;
-    /* Members defined in data_png_packing */
-    const char*   number_of_values;
-    const char*   reference_value;
-    const char*   binary_scale_factor;
-    const char*   decimal_scale_factor;
-    const char*   bits_per_value;
-    const char*   ni;
-    const char*   nj;
-    const char*   list_defining_points;
-    const char*   number_of_data_points;
-    const char*   scanning_mode;
-} grib_accessor_data_png_packing;
-
-extern grib_accessor_class* grib_accessor_class_values;
-
-static grib_accessor_class _grib_accessor_class_data_png_packing = {
-    &grib_accessor_class_values,                      /* super */
-    "data_png_packing",                      /* name */
-    sizeof(grib_accessor_data_png_packing),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    &unpack_double_element,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    &unpack_double_element_set,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_data_png_packing.h"
 
+grib_accessor_class_data_png_packing_t _grib_accessor_class_data_png_packing{"data_png_packing"};
 grib_accessor_class* grib_accessor_class_data_png_packing = &_grib_accessor_class_data_png_packing;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    grib_accessor_data_png_packing* self = (grib_accessor_data_png_packing*)a;
+void grib_accessor_class_data_png_packing_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    grib_accessor_data_png_packing_t* self = (grib_accessor_data_png_packing_t*)a;
     grib_handle* h = grib_handle_of_accessor(a);
 
     self->number_of_values      = grib_arguments_get_name(h, args, self->carg++);
@@ -151,9 +33,8 @@ static void init(grib_accessor* a, const long v, grib_arguments* args)
     a->flags |= GRIB_ACCESSOR_FLAG_DATA;
 }
 
-static int value_count(grib_accessor* a, long* n_vals)
-{
-    grib_accessor_data_png_packing* self = (grib_accessor_data_png_packing*)a;
+int grib_accessor_class_data_png_packing_t::value_count(grib_accessor* a, long* n_vals){
+    grib_accessor_data_png_packing_t* self = (grib_accessor_data_png_packing_t*)a;
     *n_vals = 0;
     return grib_get_long_internal(grib_handle_of_accessor(a), self->number_of_values, n_vals);
 }
@@ -169,16 +50,14 @@ typedef struct png_read_callback_data
     size_t offset;
 } png_read_callback_data;
 
-static void png_read_callback(png_structp png, png_bytep data, png_size_t length)
-{
+void png_read_callback(png_structp png, png_bytep data, png_size_t length){
     png_read_callback_data* p = (png_read_callback_data*)png_get_io_ptr(png);
     Assert(p->offset + length <= p->length);
     memcpy(data, p->buffer + p->offset, length);
     p->offset += length;
 }
 
-static void png_write_callback(png_structp png, png_bytep data, png_size_t length)
-{
+void png_write_callback(png_structp png, png_bytep data, png_size_t length){
     png_read_callback_data* p = (png_read_callback_data*)png_get_io_ptr(png);
     /* printf("p.offset=%zu  len=%zu p.len=%zu\n", p->offset, length, p->length); */
     /* Assert(p->offset + length <= p->length); */
@@ -191,19 +70,16 @@ static void png_write_callback(png_structp png, png_bytep data, png_size_t lengt
     p->offset += length;
 }
 
-static void png_flush_callback(png_structp png)
-{
+void png_flush_callback(png_structp png){
     /* Empty */
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_data_png_packing* self = (grib_accessor_data_png_packing*)a;
+int grib_accessor_class_data_png_packing_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_data_png_packing_t* self = (grib_accessor_data_png_packing_t*)a;
 
     int err = GRIB_SUCCESS;
     int i, j;
-    size_t buflen = grib_byte_count(a);
-
+    size_t buflen = a->byte_count();
     double bscale      = 0;
     double dscale      = 0;
     unsigned char* buf = NULL;
@@ -227,8 +103,7 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
 
     self->dirty = 0;
 
-    err = grib_value_count(a, &nn);
-    n_vals = nn;
+    err = a->value_count(&nn);    n_vals = nn;
     if (err) return err;
 
     if ((err = grib_get_long_internal(grib_handle_of_accessor(a), self->bits_per_value, &bits_per_value)) != GRIB_SUCCESS)
@@ -257,8 +132,7 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     }
 
     buf = (unsigned char*)grib_handle_of_accessor(a)->buffer->data;
-    buf += grib_byte_offset(a);
-
+    buf += a->byte_offset();
 
     if (png_sig_cmp(buf, 0, 8) != 0)
         return GRIB_INVALID_MESSAGE;
@@ -341,8 +215,7 @@ cleanup:
     return err;
 }
 
-static bool is_constant(const double* values, size_t n_vals)
-{
+bool is_constant(const double* values, size_t n_vals){
     bool isConstant = true;
     double v = 0;
     size_t i;
@@ -356,9 +229,8 @@ static bool is_constant(const double* values, size_t n_vals)
     return isConstant;
 }
 
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_data_png_packing* self = (grib_accessor_data_png_packing*)a;
+int grib_accessor_class_data_png_packing_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_data_png_packing_t* self = (grib_accessor_data_png_packing_t*)a;
     const char* cclass_name = a->cclass->name;
 
     int err = GRIB_SUCCESS;
@@ -545,7 +417,7 @@ static int pack_double(grib_accessor* a, const double* val, size_t* len)
     }
     /* buflen = n_vals*(bits_per_value/8); */
     grib_context_log(a->context, GRIB_LOG_DEBUG,
-                     "grib_accessor_data_png_packing : pack_double : packing %s, %d values", a->name, n_vals);
+                     "grib_accessor_data_png_packing_t : pack_double : packing %s, %d values", a->name, n_vals);
     buf = (unsigned char*)grib_context_buffer_malloc_clear(a->context, buflen);
 
     if (!buf) {
@@ -652,10 +524,9 @@ cleanup:
     return err;
 }
 
-static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
-{
+int grib_accessor_class_data_png_packing_t::unpack_double_element(grib_accessor* a, size_t idx, double* val){
     /* The index idx relates to codedValues NOT values! */
-    grib_accessor_data_png_packing* self = (grib_accessor_data_png_packing*)a;
+    grib_accessor_data_png_packing_t* self = (grib_accessor_data_png_packing_t*)a;
     grib_handle* hand = grib_handle_of_accessor(a);
     int err = 0;
     size_t size    = 0;
@@ -688,10 +559,9 @@ static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
     return GRIB_SUCCESS;
 }
 
-static int unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array)
-{
+int grib_accessor_class_data_png_packing_t::unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array){
     /* The index idx relates to codedValues NOT values! */
-    grib_accessor_data_png_packing* self = (grib_accessor_data_png_packing*)a;
+    grib_accessor_data_png_packing_t* self = (grib_accessor_data_png_packing_t*)a;
     grib_handle* hand = grib_handle_of_accessor(a);
     int err = 0;
     size_t size = 0, i = 0;
@@ -735,29 +605,24 @@ static int unpack_double_element_set(grib_accessor* a, const size_t* index_array
 
 #else
 
-static void print_error_feature_not_enabled(grib_context* c)
-{
+static void print_error_feature_not_enabled(grib_context* c){
     grib_context_log(c, GRIB_LOG_ERROR,
                      "PNG support not enabled. Please rebuild with -DENABLE_PNG=ON");
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
+int grib_accessor_class_data_png_packing_t::unpack_double(grib_accessor* a, double* val, size_t* len){
     print_error_feature_not_enabled(a->context);
     return GRIB_FUNCTIONALITY_NOT_ENABLED;
 }
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
+int grib_accessor_class_data_png_packing_t::pack_double(grib_accessor* a, const double* val, size_t* len){
     print_error_feature_not_enabled(a->context);
     return GRIB_FUNCTIONALITY_NOT_ENABLED;
 }
-static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
-{
+int grib_accessor_class_data_png_packing_t::unpack_double_element(grib_accessor* a, size_t idx, double* val){
     print_error_feature_not_enabled(a->context);
     return GRIB_FUNCTIONALITY_NOT_ENABLED;
 }
-static int unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array)
-{
+int grib_accessor_class_data_png_packing_t::unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array){
     print_error_feature_not_enabled(a->context);
     return GRIB_FUNCTIONALITY_NOT_ENABLED;
 }
diff --git a/src/accessor/grib_accessor_class_data_png_packing.h b/src/accessor/grib_accessor_class_data_png_packing.h
new file mode 100644
index 000000000..d8c9211a3
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_png_packing.h
@@ -0,0 +1,46 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_png_packing_h
+#define eccodes_accessor_data_png_packing_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_values.h"
+
+class grib_accessor_data_png_packing_t : public grib_accessor_values_t
+{
+public:
+    /* Members defined in data_png_packing */
+    const char*   number_of_values;
+    const char*   reference_value;
+    const char*   binary_scale_factor;
+    const char*   decimal_scale_factor;
+    const char*   bits_per_value;
+    const char*   ni;
+    const char*   nj;
+    const char*   list_defining_points;
+    const char*   number_of_data_points;
+    const char*   scanning_mode;
+};
+
+class grib_accessor_class_data_png_packing_t : public grib_accessor_class_values_t
+{
+public:
+    grib_accessor_class_data_png_packing_t(const char* name) : grib_accessor_class_values_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_png_packing_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    int unpack_double_element(grib_accessor*, size_t i, double* val) override;
+    int unpack_double_element_set(grib_accessor*, const size_t* index_array, size_t len, double* val_array) override;
+};
+#endif /* eccodes_accessor_data_png_packing_h */
diff --git a/src/accessor/grib_accessor_class_data_raw_packing.cc b/src/accessor/grib_accessor_class_data_raw_packing.cc
new file mode 100644
index 000000000..943359f47
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_raw_packing.cc
@@ -0,0 +1,194 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_data_raw_packing.h"
+#include "grib_ieeefloat.h"
+
+grib_accessor_class_data_raw_packing_t _grib_accessor_class_data_raw_packing{"data_raw_packing"};
+grib_accessor_class* grib_accessor_class_data_raw_packing = &_grib_accessor_class_data_raw_packing;
+
+
+void grib_accessor_class_data_raw_packing_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    grib_accessor_data_raw_packing_t* self = (grib_accessor_data_raw_packing_t*)a;
+
+    self->number_of_values = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
+    self->precision        = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
+    a->flags |= GRIB_ACCESSOR_FLAG_DATA;
+}
+
+int grib_accessor_class_data_raw_packing_t::value_count(grib_accessor* a, long* n_vals){
+    grib_accessor_data_raw_packing_t* self = (grib_accessor_data_raw_packing_t*)a;
+    *n_vals                              = 0;
+    return grib_get_long_internal(grib_handle_of_accessor(a), self->number_of_values, n_vals);
+}
+
+int grib_accessor_class_data_raw_packing_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_data_raw_packing_t* self = (grib_accessor_data_raw_packing_t*)a;
+    unsigned char* buf                   = NULL;
+    int bytes                            = 0;
+    size_t nvals                         = 0;
+    long inlen                           = a->byte_count();
+    long precision = 0;
+
+    int code = GRIB_SUCCESS;
+
+    if ((code = grib_get_long(grib_handle_of_accessor(a), self->precision, &precision)) != GRIB_SUCCESS)
+        return code;
+
+    self->dirty = 0;
+
+    buf = (unsigned char*)grib_handle_of_accessor(a)->buffer->data;
+    buf += a->byte_offset();
+    switch (precision) {
+        case 1:
+            bytes = 4;
+            break;
+        case 2:
+            bytes = 8;
+            break;
+        default:
+            return GRIB_NOT_IMPLEMENTED;
+    }
+
+    nvals = inlen / bytes;
+
+    if (*len < nvals)
+        return GRIB_ARRAY_TOO_SMALL;
+
+    code = grib_ieee_decode_array<double>(a->context, buf, nvals, bytes, val);
+
+    *len = nvals;
+
+    return code;
+}
+
+int grib_accessor_class_data_raw_packing_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_data_raw_packing_t* self = (grib_accessor_data_raw_packing_t*)a;
+
+    int bytes             = 0;
+    unsigned char* buffer = NULL;
+
+    long precision = 0;
+
+    double* values = (double*)val;
+    size_t inlen   = *len;
+
+    /*int free_buffer = 0;
+     *int free_values = 0;*/
+
+    int code = GRIB_SUCCESS;
+
+    size_t bufsize = 0;
+
+    if (*len == 0)
+        return GRIB_NO_VALUES;
+
+    if ((code = grib_get_long_internal(grib_handle_of_accessor(a), self->precision, &precision)) != GRIB_SUCCESS)
+        return code;
+
+    self->dirty = 1;
+
+    switch (precision) {
+        case 1:
+            bytes = 4;
+            break;
+
+        case 2:
+            bytes = 8;
+            break;
+
+        default:
+            code = GRIB_NOT_IMPLEMENTED;
+            goto clean_up;
+    }
+
+    bufsize = bytes * inlen;
+
+    buffer = (unsigned char*)grib_context_malloc(a->context, bufsize);
+
+    if (!buffer) {
+        code = GRIB_OUT_OF_MEMORY;
+        goto clean_up;
+    }
+
+    code = grib_ieee_encode_array(a->context, values, inlen, bytes, buffer);
+
+clean_up:
+    /*if (free_buffer)
+     *  free(buffer);
+     * if (free_values)
+     *  free(values);
+    */
+
+    grib_buffer_replace(a, buffer, bufsize, 1, 1);
+
+    grib_context_buffer_free(a->context, buffer);
+
+    if (code == GRIB_SUCCESS) {
+        code = grib_set_long(grib_handle_of_accessor(a), self->number_of_values, inlen);
+        if (code == GRIB_READ_ONLY)
+            code = 0;
+    }
+
+    return code;
+}
+
+int grib_accessor_class_data_raw_packing_t::unpack_double_element(grib_accessor* a, size_t idx, double* val){
+    int ret                              = 0;
+    grib_accessor_data_raw_packing_t* self = (grib_accessor_data_raw_packing_t*)a;
+    unsigned char* buf                   = NULL;
+    int bytes                            = 0;
+    size_t nvals                         = 0;
+    long inlen                           = a->byte_count();    long pos                             = 0;
+    long precision                       = 0;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->precision, &precision)) != GRIB_SUCCESS)
+        return ret;
+
+    self->dirty = 0;
+
+    buf = (unsigned char*)grib_handle_of_accessor(a)->buffer->data;
+    buf += a->byte_offset();
+    switch (precision) {
+        case 1:
+            bytes = 4;
+            break;
+
+        case 2:
+            bytes = 8;
+            break;
+
+        default:
+            return GRIB_NOT_IMPLEMENTED;
+    }
+
+    pos = bytes * idx;
+
+    Assert(pos <= inlen);
+
+    nvals = 1;
+    buf += pos;
+
+    ret = grib_ieee_decode_array(a->context, buf, nvals, bytes, val);
+
+    return ret;
+}
+
+int grib_accessor_class_data_raw_packing_t::unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array){
+    int err = 0;
+    size_t i = 0;
+    for (i=0; i<len; ++i) {
+        if ((err = unpack_double_element(a, index_array[i], val_array+i)) != GRIB_SUCCESS)
+            return err;
+    }
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_data_raw_packing.h b/src/accessor/grib_accessor_class_data_raw_packing.h
new file mode 100644
index 000000000..5b1b103e0
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_raw_packing.h
@@ -0,0 +1,38 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_raw_packing_h
+#define eccodes_accessor_data_raw_packing_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_values.h"
+
+class grib_accessor_data_raw_packing_t : public grib_accessor_values_t
+{
+public:
+    /* Members defined in data_raw_packing */
+    const char*   number_of_values;
+    const char*   precision;
+};
+
+class grib_accessor_class_data_raw_packing_t : public grib_accessor_class_values_t
+{
+public:
+    grib_accessor_class_data_raw_packing_t(const char* name) : grib_accessor_class_values_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_raw_packing_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    int unpack_double_element(grib_accessor*, size_t i, double* val) override;
+    int unpack_double_element_set(grib_accessor*, const size_t* index_array, size_t len, double* val_array) override;
+};
+#endif /* eccodes_accessor_data_raw_packing_h */
diff --git a/src/accessor/todo/grib_accessor_class_data_run_length_packing.cc b/src/accessor/grib_accessor_class_data_run_length_packing.cc
similarity index 73%
rename from src/accessor/todo/grib_accessor_class_data_run_length_packing.cc
rename to src/accessor/grib_accessor_class_data_run_length_packing.cc
index 61e581185..c0b61c254 100644
--- a/src/accessor/todo/grib_accessor_class_data_run_length_packing.cc
+++ b/src/accessor/grib_accessor_class_data_run_length_packing.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,121 +9,16 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-#include "grib_scaling.h"
 #include "grib_api_internal.h"
+#include "grib_accessor_class_data_run_length_packing.h"
+#include "grib_scaling.h"
 
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_values
-   IMPLEMENTS = init
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = pack_double
-   IMPLEMENTS = value_count
-   MEMBERS=const char*  number_of_values
-   MEMBERS=const char*  bits_per_value
-   MEMBERS=const char*  max_level_value
-   MEMBERS=const char*  number_of_level_values
-   MEMBERS=const char*  decimal_scale_factor
-   MEMBERS=const char*  level_values
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_data_run_length_packing
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in values */
-    int  carg;
-    const char* seclen;
-    const char* offsetdata;
-    const char* offsetsection;
-    int dirty;
-    /* Members defined in data_run_length_packing */
-    const char*  number_of_values;
-    const char*  bits_per_value;
-    const char*  max_level_value;
-    const char*  number_of_level_values;
-    const char*  decimal_scale_factor;
-    const char*  level_values;
-} grib_accessor_data_run_length_packing;
-
-extern grib_accessor_class* grib_accessor_class_values;
-
-static grib_accessor_class _grib_accessor_class_data_run_length_packing = {
-    &grib_accessor_class_values,                      /* super */
-    "data_run_length_packing",                      /* name */
-    sizeof(grib_accessor_data_run_length_packing),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
+grib_accessor_class_data_run_length_packing_t _grib_accessor_class_data_run_length_packing{"data_run_length_packing"};
 grib_accessor_class* grib_accessor_class_data_run_length_packing = &_grib_accessor_class_data_run_length_packing;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    grib_accessor_data_run_length_packing* self = (grib_accessor_data_run_length_packing*)a;
+void grib_accessor_class_data_run_length_packing_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    grib_accessor_data_run_length_packing_t* self = (grib_accessor_data_run_length_packing_t*)a;
     grib_handle* gh                             = grib_handle_of_accessor(a);
     self->number_of_values                      = grib_arguments_get_name(gh, args, self->carg++);
     self->bits_per_value                        = grib_arguments_get_name(gh, args, self->carg++);
@@ -133,16 +29,14 @@ static void init(grib_accessor* a, const long v, grib_arguments* args)
     a->flags |= GRIB_ACCESSOR_FLAG_DATA;
 }
 
-static int value_count(grib_accessor* a, long* number_of_values)
-{
-    grib_accessor_data_run_length_packing* self = (grib_accessor_data_run_length_packing*)a;
+int grib_accessor_class_data_run_length_packing_t::value_count(grib_accessor* a, long* number_of_values){
+    grib_accessor_data_run_length_packing_t* self = (grib_accessor_data_run_length_packing_t*)a;
     *number_of_values = 0;
     return grib_get_long_internal(grib_handle_of_accessor(a), self->number_of_values, number_of_values);
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_data_run_length_packing* self = (grib_accessor_data_run_length_packing*)a;
+int grib_accessor_class_data_run_length_packing_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_data_run_length_packing_t* self = (grib_accessor_data_run_length_packing_t*)a;
     grib_handle* gh                             = grib_handle_of_accessor(a);
     const char* cclass_name                     = a->cclass->name;
     int err                                     = GRIB_SUCCESS;
@@ -204,8 +98,7 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     }
     compressed_values = (long*)grib_context_malloc_clear(a->context, sizeof(long) * number_of_compressed_values);
     buf = (unsigned char*)grib_handle_of_accessor(a)->buffer->data;
-    offsetBeforeData = grib_byte_offset(a);
-    buf += offsetBeforeData;
+    offsetBeforeData = a->byte_offset();    buf += offsetBeforeData;
     pos = 0;
     grib_decode_long_array(buf, &pos, bits_per_value, number_of_compressed_values, compressed_values);
     j = 0;
@@ -246,9 +139,8 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     return err;
 }
 
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_data_run_length_packing* self = (grib_accessor_data_run_length_packing*)a;
+int grib_accessor_class_data_run_length_packing_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_data_run_length_packing_t* self = (grib_accessor_data_run_length_packing_t*)a;
     grib_handle* gh                             = grib_handle_of_accessor(a);
     const char* cclass_name                     = a->cclass->name;
     int err                                     = GRIB_SUCCESS;
diff --git a/src/accessor/grib_accessor_class_data_run_length_packing.h b/src/accessor/grib_accessor_class_data_run_length_packing.h
new file mode 100644
index 000000000..3125fdcf4
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_run_length_packing.h
@@ -0,0 +1,40 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_run_length_packing_h
+#define eccodes_accessor_data_run_length_packing_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_values.h"
+
+class grib_accessor_data_run_length_packing_t : public grib_accessor_values_t
+{
+public:
+    /* Members defined in data_run_length_packing */
+    const char*  number_of_values;
+    const char*  bits_per_value;
+    const char*  max_level_value;
+    const char*  number_of_level_values;
+    const char*  decimal_scale_factor;
+    const char*  level_values;
+};
+
+class grib_accessor_class_data_run_length_packing_t : public grib_accessor_class_values_t
+{
+public:
+    grib_accessor_class_data_run_length_packing_t(const char* name) : grib_accessor_class_values_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_run_length_packing_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_data_run_length_packing_h */
diff --git a/src/accessor/grib_accessor_class_data_secondary_bitmap.cc b/src/accessor/grib_accessor_class_data_secondary_bitmap.cc
new file mode 100644
index 000000000..51bfb4afc
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_secondary_bitmap.cc
@@ -0,0 +1,118 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_data_secondary_bitmap.h"
+
+grib_accessor_class_data_secondary_bitmap_t _grib_accessor_class_data_secondary_bitmap{"data_secondary_bitmap"};
+grib_accessor_class* grib_accessor_class_data_secondary_bitmap = &_grib_accessor_class_data_secondary_bitmap;
+
+
+void grib_accessor_class_data_secondary_bitmap_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    grib_accessor_data_secondary_bitmap_t* self = (grib_accessor_data_secondary_bitmap_t*)a;
+    self->primary_bitmap                      = grib_arguments_get_name(grib_handle_of_accessor(a), args, 0);
+    self->secondary_bitmap                    = grib_arguments_get_name(grib_handle_of_accessor(a), args, 1);
+    self->missing_value                       = grib_arguments_get_name(grib_handle_of_accessor(a), args, 2);
+    self->expand_by                           = grib_arguments_get_name(grib_handle_of_accessor(a), args, 3);
+
+    a->length = 0;
+}
+
+void grib_accessor_class_data_secondary_bitmap_t::dump(grib_accessor* a, grib_dumper* dumper){
+    grib_dump_values(dumper, a);
+}
+
+int grib_accessor_class_data_secondary_bitmap_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_data_secondary_bitmap_t* self = (grib_accessor_data_secondary_bitmap_t*)a;
+
+    size_t i       = 0;
+    size_t j       = 0;
+    size_t k       = 0;
+    size_t m       = 0;
+    size_t n_vals  = 0;
+    long nn        = 0;
+    long expand_by = 0;
+    int err        = 0;
+    size_t primary_len;
+    size_t secondary_len;
+    double* primary_vals;
+    double* secondary_vals;
+    err    = a->value_count(&nn);    n_vals = nn;
+    if (err)
+        return err;
+
+    if (*len < n_vals) {
+        *len = n_vals;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    if ((err = grib_get_long(grib_handle_of_accessor(a), self->expand_by, &expand_by)) != GRIB_SUCCESS)
+        return err;
+
+    if ((err = grib_get_size(grib_handle_of_accessor(a), self->primary_bitmap, &primary_len)) != GRIB_SUCCESS)
+        return err;
+
+    if ((err = grib_get_size(grib_handle_of_accessor(a), self->secondary_bitmap, &secondary_len)) != GRIB_SUCCESS)
+        return err;
+
+    primary_vals = (double*)grib_context_malloc(a->context, primary_len * sizeof(double));
+    if (!primary_vals)
+        return GRIB_OUT_OF_MEMORY;
+
+    secondary_vals = (double*)grib_context_malloc(a->context, secondary_len * sizeof(double));
+    if (!secondary_vals) {
+        grib_context_free(a->context, primary_vals);
+        return GRIB_OUT_OF_MEMORY;
+    }
+
+    if ((err = grib_get_double_array_internal(grib_handle_of_accessor(a), self->primary_bitmap, primary_vals, &primary_len)) != GRIB_SUCCESS) {
+        grib_context_free(a->context, secondary_vals);
+        grib_context_free(a->context, primary_vals);
+        return err;
+    }
+
+    if ((err = grib_get_double_array_internal(grib_handle_of_accessor(a), self->secondary_bitmap, secondary_vals, &secondary_len)) != GRIB_SUCCESS) {
+        grib_context_free(a->context, secondary_vals);
+        grib_context_free(a->context, primary_vals);
+        return err;
+    }
+
+    k = 0;
+    m = 0;
+    for (i = 0; i < primary_len; i++) {
+        /* if(primary_vals[i]) f++; */
+        if (primary_vals[i]) {
+            for (j = 0; j < expand_by; j++)
+                val[k++] = secondary_vals[m++];
+        }
+        else {
+            for (j = 0; j < expand_by; j++)
+                val[k++] = 0;
+        }
+    }
+
+    Assert(k <= *len);
+    Assert(m <= secondary_len);
+
+    /*printf("FOOBAR %d %d %ld %d\n",f,primary_len,expand_by,n_vals);*/
+
+    *len = n_vals;
+
+    grib_context_free(a->context, primary_vals);
+    grib_context_free(a->context, secondary_vals);
+    return err;
+}
+
+int grib_accessor_class_data_secondary_bitmap_t::get_native_type(grib_accessor* a){
+    // grib_accessor_data_secondary_bitmap_t* self =  (grib_accessor_data_secondary_bitmap_t*)a;
+    //return grib_accessor_get_native_type(grib_find_accessor(grib_handle_of_accessor(a),self->coded_values));
+    return GRIB_TYPE_DOUBLE;
+}
diff --git a/src/accessor/grib_accessor_class_data_secondary_bitmap.h b/src/accessor/grib_accessor_class_data_secondary_bitmap.h
new file mode 100644
index 000000000..3ac86e324
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_secondary_bitmap.h
@@ -0,0 +1,38 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_secondary_bitmap_h
+#define eccodes_accessor_data_secondary_bitmap_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_data_secondary_bitmap_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in data_secondary_bitmap */
+    const char*  primary_bitmap;
+    const char*  secondary_bitmap;
+    const char*  missing_value;
+    const char*  expand_by;
+};
+
+class grib_accessor_class_data_secondary_bitmap_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_data_secondary_bitmap_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_secondary_bitmap_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_data_secondary_bitmap_h */
diff --git a/src/accessor/todo/grib_accessor_class_data_sh_packed.cc b/src/accessor/grib_accessor_class_data_sh_packed.cc
similarity index 63%
rename from src/accessor/todo/grib_accessor_class_data_sh_packed.cc
rename to src/accessor/grib_accessor_class_data_sh_packed.cc
index 25687d262..a1cb7a7ba 100644
--- a/src/accessor/todo/grib_accessor_class_data_sh_packed.cc
+++ b/src/accessor/grib_accessor_class_data_sh_packed.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,142 +9,19 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-#include "grib_scaling.h"
 #include "grib_api_internal.h"
-#include <cmath>
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_data_simple_packing
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = value_count
-   IMPLEMENTS = init
-   MEMBERS= const char*  GRIBEX_sh_bug_present
-   MEMBERS= const char*  ieee_floats
-   MEMBERS= const char*  laplacianOperatorIsSet
-   MEMBERS= const char*  laplacianOperator
-   MEMBERS= const char*  sub_j
-   MEMBERS= const char*  sub_k
-   MEMBERS= const char*  sub_m
-   MEMBERS= const char*  pen_j
-   MEMBERS= const char*  pen_k
-   MEMBERS= const char*  pen_m
-   END_CLASS_DEF
-
- */
-
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_data_sh_packed
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in values */
-    int  carg;
-    const char* seclen;
-    const char* offsetdata;
-    const char* offsetsection;
-    int dirty;
-    /* Members defined in data_simple_packing */
-    int edition;
-    const char*  units_factor;
-    const char*  units_bias;
-    const char*  changing_precision;
-    const char*  number_of_values;
-    const char*  bits_per_value;
-    const char*  reference_value;
-    const char*  binary_scale_factor;
-    const char*  decimal_scale_factor;
-    const char*  optimize_scaling_factor;
-    /* Members defined in data_sh_packed */
-    const char*  GRIBEX_sh_bug_present;
-    const char*  ieee_floats;
-    const char*  laplacianOperatorIsSet;
-    const char*  laplacianOperator;
-    const char*  sub_j;
-    const char*  sub_k;
-    const char*  sub_m;
-    const char*  pen_j;
-    const char*  pen_k;
-    const char*  pen_m;
-} grib_accessor_data_sh_packed;
-
-extern grib_accessor_class* grib_accessor_class_data_simple_packing;
-
-static grib_accessor_class _grib_accessor_class_data_sh_packed = {
-    &grib_accessor_class_data_simple_packing,                      /* super */
-    "data_sh_packed",                      /* name */
-    sizeof(grib_accessor_data_sh_packed),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_data_sh_packed.h"
+#include "grib_scaling.h"
 
+grib_accessor_class_data_sh_packed_t _grib_accessor_class_data_sh_packed{"data_sh_packed"};
 grib_accessor_class* grib_accessor_class_data_sh_packed = &_grib_accessor_class_data_sh_packed;
 
-/* END_CLASS_IMP */
 
 typedef unsigned long (*encode_float_proc)(double);
 typedef double (*decode_float_proc)(unsigned long);
 
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    grib_accessor_data_sh_packed* self = (grib_accessor_data_sh_packed*)a;
+void grib_accessor_class_data_sh_packed_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    grib_accessor_data_sh_packed_t* self = (grib_accessor_data_sh_packed_t*)a;
     grib_handle* hand                  = grib_handle_of_accessor(a);
 
     self->GRIBEX_sh_bug_present  = grib_arguments_get_name(hand, args, self->carg++);
@@ -161,9 +39,8 @@ static void init(grib_accessor* a, const long v, grib_arguments* args)
     a->length = 0;
 }
 
-static int value_count(grib_accessor* a, long* count)
-{
-    grib_accessor_data_sh_packed* self = (grib_accessor_data_sh_packed*)a;
+int grib_accessor_class_data_sh_packed_t::value_count(grib_accessor* a, long* count){
+    grib_accessor_data_sh_packed_t* self = (grib_accessor_data_sh_packed_t*)a;
     grib_handle* hand = grib_handle_of_accessor(a);
     int ret = 0;
     const char* cclass_name = a->cclass->name;
@@ -198,9 +75,8 @@ static int value_count(grib_accessor* a, long* count)
     return ret;
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_data_sh_packed* self = (grib_accessor_data_sh_packed*)a;
+int grib_accessor_class_data_sh_packed_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_data_sh_packed_t* self = (grib_accessor_data_sh_packed_t*)a;
 
     size_t i    = 0;
     int ret     = GRIB_SUCCESS;
@@ -234,8 +110,7 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     decode_float_proc decode_float = NULL;
 
     n_vals = 0;
-    err    = grib_value_count(a, &n_vals);
-    if (err)
+    err    = a->value_count(&n_vals);    if (err)
         return err;
 
     if (*len < n_vals) {
diff --git a/src/accessor/grib_accessor_class_data_sh_packed.h b/src/accessor/grib_accessor_class_data_sh_packed.h
new file mode 100644
index 000000000..2d7cbdf47
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_sh_packed.h
@@ -0,0 +1,43 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_sh_packed_h
+#define eccodes_accessor_data_sh_packed_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_data_simple_packing.h"
+
+class grib_accessor_data_sh_packed_t : public grib_accessor_data_simple_packing_t
+{
+public:
+    /* Members defined in data_sh_packed */
+    const char*  GRIBEX_sh_bug_present;
+    const char*  ieee_floats;
+    const char*  laplacianOperatorIsSet;
+    const char*  laplacianOperator;
+    const char*  sub_j;
+    const char*  sub_k;
+    const char*  sub_m;
+    const char*  pen_j;
+    const char*  pen_k;
+    const char*  pen_m;
+};
+
+class grib_accessor_class_data_sh_packed_t : public grib_accessor_class_data_simple_packing_t
+{
+public:
+    grib_accessor_class_data_sh_packed_t(const char* name) : grib_accessor_class_data_simple_packing_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_sh_packed_t{}; }
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_data_sh_packed_h */
diff --git a/src/accessor/todo/grib_accessor_class_data_sh_unpacked.cc b/src/accessor/grib_accessor_class_data_sh_unpacked.cc
similarity index 61%
rename from src/accessor/todo/grib_accessor_class_data_sh_unpacked.cc
rename to src/accessor/grib_accessor_class_data_sh_unpacked.cc
index 394793612..842411f26 100644
--- a/src/accessor/todo/grib_accessor_class_data_sh_unpacked.cc
+++ b/src/accessor/grib_accessor_class_data_sh_unpacked.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,142 +9,19 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-#include "grib_scaling.h"
 #include "grib_api_internal.h"
-#include <cmath>
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_data_simple_packing
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = value_count
-   IMPLEMENTS = init
-   MEMBERS= const char*  GRIBEX_sh_bug_present
-   MEMBERS= const char*  ieee_floats
-   MEMBERS= const char*  laplacianOperatorIsSet
-   MEMBERS= const char*  laplacianOperator
-   MEMBERS= const char*  sub_j
-   MEMBERS= const char*  sub_k
-   MEMBERS= const char*  sub_m
-   MEMBERS= const char*  pen_j
-   MEMBERS= const char*  pen_k
-   MEMBERS= const char*  pen_m
-   END_CLASS_DEF
-
- */
-
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_data_sh_unpacked
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in values */
-    int  carg;
-    const char* seclen;
-    const char* offsetdata;
-    const char* offsetsection;
-    int dirty;
-    /* Members defined in data_simple_packing */
-    int edition;
-    const char*  units_factor;
-    const char*  units_bias;
-    const char*  changing_precision;
-    const char*  number_of_values;
-    const char*  bits_per_value;
-    const char*  reference_value;
-    const char*  binary_scale_factor;
-    const char*  decimal_scale_factor;
-    const char*  optimize_scaling_factor;
-    /* Members defined in data_sh_unpacked */
-    const char*  GRIBEX_sh_bug_present;
-    const char*  ieee_floats;
-    const char*  laplacianOperatorIsSet;
-    const char*  laplacianOperator;
-    const char*  sub_j;
-    const char*  sub_k;
-    const char*  sub_m;
-    const char*  pen_j;
-    const char*  pen_k;
-    const char*  pen_m;
-} grib_accessor_data_sh_unpacked;
-
-extern grib_accessor_class* grib_accessor_class_data_simple_packing;
-
-static grib_accessor_class _grib_accessor_class_data_sh_unpacked = {
-    &grib_accessor_class_data_simple_packing,                      /* super */
-    "data_sh_unpacked",                      /* name */
-    sizeof(grib_accessor_data_sh_unpacked),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_data_sh_unpacked.h"
+#include "grib_scaling.h"
 
+grib_accessor_class_data_sh_unpacked_t _grib_accessor_class_data_sh_unpacked{"data_sh_unpacked"};
 grib_accessor_class* grib_accessor_class_data_sh_unpacked = &_grib_accessor_class_data_sh_unpacked;
 
-/* END_CLASS_IMP */
 
 typedef unsigned long (*encode_float_proc)(double);
 typedef double (*decode_float_proc)(unsigned long);
 
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    grib_accessor_data_sh_unpacked* self = (grib_accessor_data_sh_unpacked*)a;
+void grib_accessor_class_data_sh_unpacked_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    grib_accessor_data_sh_unpacked_t* self = (grib_accessor_data_sh_unpacked_t*)a;
     grib_handle* hand                    = grib_handle_of_accessor(a);
 
     self->GRIBEX_sh_bug_present  = grib_arguments_get_name(hand, args, self->carg++);
@@ -161,9 +39,8 @@ static void init(grib_accessor* a, const long v, grib_arguments* args)
     a->length = 0;
 }
 
-static int value_count(grib_accessor* a, long* count)
-{
-    grib_accessor_data_sh_unpacked* self = (grib_accessor_data_sh_unpacked*)a;
+int grib_accessor_class_data_sh_unpacked_t::value_count(grib_accessor* a, long* count){
+    grib_accessor_data_sh_unpacked_t* self = (grib_accessor_data_sh_unpacked_t*)a;
     int ret                              = 0;
 
     long sub_j = 0;
@@ -185,9 +62,8 @@ static int value_count(grib_accessor* a, long* count)
     return ret;
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_data_sh_unpacked* self = (grib_accessor_data_sh_unpacked*)a;
+int grib_accessor_class_data_sh_unpacked_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_data_sh_unpacked_t* self = (grib_accessor_data_sh_unpacked_t*)a;
 
     size_t i      = 0;
     int ret       = GRIB_SUCCESS;
@@ -234,8 +110,7 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     decode_float_proc decode_float = NULL;
 
     n_vals = 0;
-    err    = grib_value_count(a, &n_vals);
-    if (err)
+    err    = a->value_count(&n_vals);    if (err)
         return err;
 
     if (*len < n_vals) {
diff --git a/src/accessor/grib_accessor_class_data_sh_unpacked.h b/src/accessor/grib_accessor_class_data_sh_unpacked.h
new file mode 100644
index 000000000..4b1e893c0
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_sh_unpacked.h
@@ -0,0 +1,43 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_sh_unpacked_h
+#define eccodes_accessor_data_sh_unpacked_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_data_simple_packing.h"
+
+class grib_accessor_data_sh_unpacked_t : public grib_accessor_data_simple_packing_t
+{
+public:
+    /* Members defined in data_sh_unpacked */
+    const char*  GRIBEX_sh_bug_present;
+    const char*  ieee_floats;
+    const char*  laplacianOperatorIsSet;
+    const char*  laplacianOperator;
+    const char*  sub_j;
+    const char*  sub_k;
+    const char*  sub_m;
+    const char*  pen_j;
+    const char*  pen_k;
+    const char*  pen_m;
+};
+
+class grib_accessor_class_data_sh_unpacked_t : public grib_accessor_class_data_simple_packing_t
+{
+public:
+    grib_accessor_class_data_sh_unpacked_t(const char* name) : grib_accessor_class_data_simple_packing_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_sh_unpacked_t{}; }
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_data_sh_unpacked_h */
diff --git a/src/accessor/grib_accessor_class_data_shsimple_packing.cc b/src/accessor/grib_accessor_class_data_shsimple_packing.cc
new file mode 100644
index 000000000..68fc83a7b
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_shsimple_packing.cc
@@ -0,0 +1,60 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_data_shsimple_packing.h"
+
+grib_accessor_class_data_shsimple_packing_t _grib_accessor_class_data_shsimple_packing{"data_shsimple_packing"};
+grib_accessor_class* grib_accessor_class_data_shsimple_packing = &_grib_accessor_class_data_shsimple_packing;
+
+
+void grib_accessor_class_data_shsimple_packing_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    grib_accessor_data_shsimple_packing_t* self = (grib_accessor_data_shsimple_packing_t*)a;
+
+    self->coded_values = grib_arguments_get_name(grib_handle_of_accessor(a), args, 0);
+    self->real_part    = grib_arguments_get_name(grib_handle_of_accessor(a), args, 1);
+    a->flags |= GRIB_ACCESSOR_FLAG_DATA;
+
+    a->length = 0;
+}
+
+void grib_accessor_class_data_shsimple_packing_t::dump(grib_accessor* a, grib_dumper* dumper){
+    grib_dump_values(dumper, a);
+}
+
+int grib_accessor_class_data_shsimple_packing_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_data_shsimple_packing_t* self = (grib_accessor_data_shsimple_packing_t*)a;
+    int err                                   = GRIB_SUCCESS;
+
+    size_t coded_n_vals = *len - 1;
+    size_t n_vals       = *len;
+
+    self->dirty = 1;
+
+    if (*len == 0)
+        return GRIB_NO_VALUES;
+
+    if ((err = grib_set_double_internal(grib_handle_of_accessor(a), self->real_part, *val)) != GRIB_SUCCESS)
+        return err;
+
+    val++;
+
+    if ((err = grib_set_double_array_internal(grib_handle_of_accessor(a), self->coded_values, val, coded_n_vals)) != GRIB_SUCCESS)
+        return err;
+
+    *len = n_vals;
+
+    return err;
+}
+
+int grib_accessor_class_data_shsimple_packing_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_DOUBLE;
+}
diff --git a/src/accessor/grib_accessor_class_data_shsimple_packing.h b/src/accessor/grib_accessor_class_data_shsimple_packing.h
new file mode 100644
index 000000000..851907eb9
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_shsimple_packing.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_shsimple_packing_h
+#define eccodes_accessor_data_shsimple_packing_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_data_shsimple_packing_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in data_shsimple_packing */
+    const char*  coded_values;
+    const char*  real_part;
+    int dirty;
+};
+
+class grib_accessor_class_data_shsimple_packing_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_data_shsimple_packing_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_shsimple_packing_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_data_shsimple_packing_h */
diff --git a/src/accessor/todo/grib_accessor_class_data_simple_packing.cc b/src/accessor/grib_accessor_class_data_simple_packing.cc
similarity index 79%
rename from src/accessor/todo/grib_accessor_class_data_simple_packing.cc
rename to src/accessor/grib_accessor_class_data_simple_packing.cc
index e78bda53c..f01a2c612 100644
--- a/src/accessor/todo/grib_accessor_class_data_simple_packing.cc
+++ b/src/accessor/grib_accessor_class_data_simple_packing.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,138 +9,20 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
+#include "grib_api_internal.h"
+#include "grib_accessor_class_data_simple_packing.h"
 #include "grib_scaling.h"
 #include "grib_bits_any_endian_simple.h"
 #include "grib_optimize_decimal_factor.h"
 #include <float.h>
 #include <type_traits>
 
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_values
-   IMPLEMENTS = init
-   IMPLEMENTS = unpack_double;unpack_float
-   IMPLEMENTS = unpack_double_element;unpack_double_element_set
-   IMPLEMENTS = unpack_double_subarray
-   IMPLEMENTS = pack_double
-   IMPLEMENTS = value_count
-   MEMBERS=int edition
-   MEMBERS=const char*  units_factor
-   MEMBERS=const char*  units_bias
-   MEMBERS=const char*  changing_precision
-   MEMBERS=const char*  number_of_values
-   MEMBERS=const char*  bits_per_value
-   MEMBERS=const char*  reference_value
-   MEMBERS=const char*  binary_scale_factor
-   MEMBERS=const char*  decimal_scale_factor
-   MEMBERS=const char*  optimize_scaling_factor
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_float(grib_accessor*, float* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static int unpack_double_element(grib_accessor*, size_t i, double* val);
-static int unpack_double_element_set(grib_accessor*, const size_t* index_array, size_t len, double* val_array);
-static int unpack_double_subarray(grib_accessor*, double* val, size_t start, size_t len);
-
-typedef struct grib_accessor_data_simple_packing
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in values */
-    int  carg;
-    const char* seclen;
-    const char* offsetdata;
-    const char* offsetsection;
-    int dirty;
-    /* Members defined in data_simple_packing */
-    int edition;
-    const char*  units_factor;
-    const char*  units_bias;
-    const char*  changing_precision;
-    const char*  number_of_values;
-    const char*  bits_per_value;
-    const char*  reference_value;
-    const char*  binary_scale_factor;
-    const char*  decimal_scale_factor;
-    const char*  optimize_scaling_factor;
-} grib_accessor_data_simple_packing;
-
-extern grib_accessor_class* grib_accessor_class_values;
-
-static grib_accessor_class _grib_accessor_class_data_simple_packing = {
-    &grib_accessor_class_values,                      /* super */
-    "data_simple_packing",                      /* name */
-    sizeof(grib_accessor_data_simple_packing),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    &unpack_float,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    &unpack_double_element,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    &unpack_double_element_set,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    &unpack_double_subarray,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
+grib_accessor_class_data_simple_packing_t _grib_accessor_class_data_simple_packing{"data_simple_packing"};
 grib_accessor_class* grib_accessor_class_data_simple_packing = &_grib_accessor_class_data_simple_packing;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    grib_accessor_data_simple_packing* self = (grib_accessor_data_simple_packing*)a;
+void grib_accessor_class_data_simple_packing_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    grib_accessor_data_simple_packing_t* self = (grib_accessor_data_simple_packing_t*)a;
     grib_handle* gh                         = grib_handle_of_accessor(a);
     self->units_factor                      = grib_arguments_get_name(gh, args, self->carg++);
     self->units_bias                        = grib_arguments_get_name(gh, args, self->carg++);
@@ -163,8 +46,7 @@ static const unsigned long nbits[32] = {
     0x40000000, 0x80000000
 };
 
-static int number_of_bits(unsigned long x, long* result)
-{
+static int number_of_bits(unsigned long x, long* result){
     const int count        = sizeof(nbits) / sizeof(nbits[0]);
     const unsigned long* n = nbits;
     *result                = 0;
@@ -178,17 +60,15 @@ static int number_of_bits(unsigned long x, long* result)
     return GRIB_SUCCESS;
 }
 
-static int value_count(grib_accessor* a, long* number_of_values)
-{
-    grib_accessor_data_simple_packing* self = (grib_accessor_data_simple_packing*)a;
+int grib_accessor_class_data_simple_packing_t::value_count(grib_accessor* a, long* number_of_values){
+    grib_accessor_data_simple_packing_t* self = (grib_accessor_data_simple_packing_t*)a;
     *number_of_values                       = 0;
 
     return grib_get_long_internal(grib_handle_of_accessor(a), self->number_of_values, number_of_values);
 }
 
-static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
-{
-    grib_accessor_data_simple_packing* self = (grib_accessor_data_simple_packing*)a;
+int grib_accessor_class_data_simple_packing_t::unpack_double_element(grib_accessor* a, size_t idx, double* val){
+    grib_accessor_data_simple_packing_t* self = (grib_accessor_data_simple_packing_t*)a;
     const char* cclass_name                 = a->cclass->name;
 
     long n_vals;
@@ -205,8 +85,7 @@ static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
     long pos           = 0;
 
     n_vals = 0;
-    err    = grib_value_count(a, &n_vals);
-    if (err)
+    err    = a->value_count(&n_vals);    if (err)
         return err;
 
     if ((err = grib_get_long_internal(gh, self->bits_per_value, &bits_per_value)) != GRIB_SUCCESS)
@@ -237,8 +116,7 @@ static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
                      "%s: %s: creating %s, %ld values (idx=%zu)",
                      cclass_name, __func__, a->name, n_vals, idx);
 
-    buf += grib_byte_offset(a);
-
+    buf += a->byte_offset();
     /*Assert(((bits_per_value*n_vals)/8) < (1<<29));*/ /* See GRIB-787 */
 
     if (bits_per_value % 8) {
@@ -270,8 +148,7 @@ static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
     return err;
 }
 
-static int unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array)
-{
+int grib_accessor_class_data_simple_packing_t::unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array){
     int err = 0;
     size_t i = 0;
     for (i=0; i<len; ++i) {
@@ -282,11 +159,10 @@ static int unpack_double_element_set(grib_accessor* a, const size_t* index_array
 }
 
 template <typename T>
-static int unpack(grib_accessor* a, T* val, size_t* len)
-{
+int unpack(grib_accessor* a, T* val, size_t* len){
     static_assert(std::is_floating_point<T>::value, "Requires floating point numbers");
 
-    grib_accessor_data_simple_packing* self = (grib_accessor_data_simple_packing*)a;
+    grib_accessor_data_simple_packing_t* self = (grib_accessor_data_simple_packing_t*)a;
     const char* cclass_name                 = a->cclass->name;
     grib_handle* gh                         = grib_handle_of_accessor(a);
     unsigned char* buf                      = (unsigned char*)grib_handle_of_accessor(a)->buffer->data;
@@ -307,8 +183,7 @@ static int unpack(grib_accessor* a, T* val, size_t* len)
     double units_factor = 1.0;
     double units_bias   = 0.0;
 
-    err = grib_value_count(a, &count);
-    if (err)
+    err = a->value_count(&count);    if (err)
         return err;
     n_vals = count;
 
@@ -369,8 +244,7 @@ static int unpack(grib_accessor* a, T* val, size_t* len)
     grib_context_log(a->context, GRIB_LOG_DEBUG,
                      "%s %s: Creating %s, %zu values", cclass_name, __func__, a->name, n_vals);
 
-    offsetBeforeData = grib_byte_offset(a);
-    buf += offsetBeforeData;
+    offsetBeforeData = a->byte_offset();    buf += offsetBeforeData;
 
     /*Assert(((bits_per_value*n_vals)/8) < (1<<29));*/ /* See GRIB-787 */
 
@@ -424,19 +298,16 @@ static int unpack(grib_accessor* a, T* val, size_t* len)
     return err;
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
+int grib_accessor_class_data_simple_packing_t::unpack_double(grib_accessor* a, double* val, size_t* len){
     return unpack<double>(a, val, len);
 }
 
-static int unpack_float(grib_accessor* a, float* val, size_t* len)
-{
+int grib_accessor_class_data_simple_packing_t::unpack_float(grib_accessor* a, float* val, size_t* len){
     return unpack<float>(a, val, len);
 }
 
-static int _unpack_double(grib_accessor* a, double* val, size_t* len, unsigned char* buf, long pos, size_t n_vals)
-{
-    grib_accessor_data_simple_packing* self = (grib_accessor_data_simple_packing*)a;
+int _unpack_double(grib_accessor* a, double* val, size_t* len, unsigned char* buf, long pos, size_t n_vals){
+    grib_accessor_data_simple_packing_t* self = (grib_accessor_data_simple_packing_t*)a;
     grib_handle* gh                         = grib_handle_of_accessor(a);
     const char* cclass_name                 = a->cclass->name;
 
@@ -510,8 +381,7 @@ static int _unpack_double(grib_accessor* a, double* val, size_t* len, unsigned c
     grib_context_log(a->context, GRIB_LOG_DEBUG,
                      "%s %s: Creating %s, %zu values", cclass_name, __func__, a->name, n_vals);
 
-    offsetBeforeData = grib_byte_offset(a);
-    buf += offsetBeforeData;
+    offsetBeforeData = a->byte_offset();    buf += offsetBeforeData;
 
     /*Assert(((bits_per_value*n_vals)/8) < (1<<29));*/ /* See GRIB-787 */
 
@@ -561,9 +431,8 @@ static int _unpack_double(grib_accessor* a, double* val, size_t* len, unsigned c
     return err;
 }
 
-static int unpack_double_subarray(grib_accessor* a, double* val, size_t start, size_t len)
-{
-    grib_accessor_data_simple_packing* self = (grib_accessor_data_simple_packing*)a;
+int grib_accessor_class_data_simple_packing_t::unpack_double_subarray(grib_accessor* a, double* val, size_t start, size_t len){
+    grib_accessor_data_simple_packing_t* self = (grib_accessor_data_simple_packing_t*)a;
     unsigned char* buf                      = (unsigned char*)grib_handle_of_accessor(a)->buffer->data;
     size_t nvals                            = len;
     size_t* plen                            = &len;
@@ -580,9 +449,8 @@ static int unpack_double_subarray(grib_accessor* a, double* val, size_t start, s
     return _unpack_double(a, val, plen, buf, pos, nvals);
 }
 
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_data_simple_packing* self = (grib_accessor_data_simple_packing*)a;
+int grib_accessor_class_data_simple_packing_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_data_simple_packing_t* self = (grib_accessor_data_simple_packing_t*)a;
     grib_handle* gh                         = grib_handle_of_accessor(a);
     const char* cclass_name                 = a->cclass->name;
 
diff --git a/src/accessor/grib_accessor_class_data_simple_packing.h b/src/accessor/grib_accessor_class_data_simple_packing.h
new file mode 100644
index 000000000..9187f37eb
--- /dev/null
+++ b/src/accessor/grib_accessor_class_data_simple_packing.h
@@ -0,0 +1,48 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_data_simple_packing_h
+#define eccodes_accessor_data_simple_packing_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_values.h"
+
+class grib_accessor_data_simple_packing_t : public grib_accessor_values_t
+{
+public:
+    /* Members defined in data_simple_packing */
+    int edition;
+    const char*  units_factor;
+    const char*  units_bias;
+    const char*  changing_precision;
+    const char*  number_of_values;
+    const char*  bits_per_value;
+    const char*  reference_value;
+    const char*  binary_scale_factor;
+    const char*  decimal_scale_factor;
+    const char*  optimize_scaling_factor;
+};
+
+class grib_accessor_class_data_simple_packing_t : public grib_accessor_class_values_t
+{
+public:
+    grib_accessor_class_data_simple_packing_t(const char* name) : grib_accessor_class_values_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_data_simple_packing_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_float(grib_accessor*, float* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    int unpack_double_element(grib_accessor*, size_t i, double* val) override;
+    int unpack_double_element_set(grib_accessor*, const size_t* index_array, size_t len, double* val_array) override;
+    int unpack_double_subarray(grib_accessor*, double* val, size_t start, size_t len) override;
+};
+#endif /* eccodes_accessor_data_simple_packing_h */
diff --git a/src/accessor/grib_accessor_class_decimal_precision.cc b/src/accessor/grib_accessor_class_decimal_precision.cc
new file mode 100644
index 000000000..0ffe7b0c1
--- /dev/null
+++ b/src/accessor/grib_accessor_class_decimal_precision.cc
@@ -0,0 +1,103 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_decimal_precision.h"
+
+grib_accessor_class_decimal_precision_t _grib_accessor_class_decimal_precision{"decimal_precision"};
+grib_accessor_class* grib_accessor_class_decimal_precision = &_grib_accessor_class_decimal_precision;
+
+
+void grib_accessor_class_decimal_precision_t::init(grib_accessor* a, const long l, grib_arguments* args){
+    int n                                 = 0;
+    grib_accessor_decimal_precision_t* self = (grib_accessor_decimal_precision_t*)a;
+
+    self->bits_per_value       = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
+    self->decimal_scale_factor = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
+    self->changing_precision   = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
+    self->values               = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
+
+    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
+    a->length = 0;
+}
+
+int grib_accessor_class_decimal_precision_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    int ret                               = 0;
+    grib_accessor_decimal_precision_t* self = (grib_accessor_decimal_precision_t*)a;
+    grib_handle* h                        = grib_handle_of_accessor(a);
+
+    if ((ret = grib_get_long_internal(h, self->decimal_scale_factor, val)) != GRIB_SUCCESS)
+        return ret;
+
+    *len = 1;
+    return ret;
+}
+
+int grib_accessor_class_decimal_precision_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    long bitsPerValue                     = 0;
+    double* values                        = NULL;
+    size_t size                           = 0;
+    int ret                               = 0;
+    grib_accessor_decimal_precision_t* self = (grib_accessor_decimal_precision_t*)a;
+    grib_context* c                       = a->context;
+    grib_handle* h                        = grib_handle_of_accessor(a);
+
+    if (!self->values) {
+        if ((ret = grib_set_long_internal(h, self->bits_per_value, 0)) != GRIB_SUCCESS)
+            return ret;
+
+        if ((ret = grib_set_long_internal(h, self->decimal_scale_factor, *val)) != GRIB_SUCCESS)
+            return ret;
+
+        if ((ret = grib_set_long_internal(h, self->changing_precision, 1)) != GRIB_SUCCESS) {
+            grib_context_free(c, values);
+            return ret;
+        }
+
+        return GRIB_SUCCESS;
+    }
+
+    if ((ret = grib_get_size(h, self->values, &size)) != GRIB_SUCCESS)
+        return ret;
+
+    values = (double*)grib_context_malloc(c, size * sizeof(double));
+    if (!values)
+        return GRIB_OUT_OF_MEMORY;
+
+    if ((ret = grib_get_double_array_internal(h, self->values, values, &size)) != GRIB_SUCCESS) {
+        grib_context_buffer_free(c, values);
+        return ret;
+    }
+
+    if ((ret = grib_set_long_internal(h, self->decimal_scale_factor, *val)) != GRIB_SUCCESS) {
+        grib_context_buffer_free(c, values);
+        return ret;
+    }
+
+    if ((ret = grib_set_long_internal(h, self->bits_per_value, bitsPerValue)) != GRIB_SUCCESS) {
+        grib_context_free(c, values);
+        return ret;
+    }
+
+    if ((ret = grib_set_long_internal(h, self->changing_precision, 1)) != GRIB_SUCCESS) {
+        grib_context_free(c, values);
+        return ret;
+    }
+
+    if ((ret = grib_set_double_array_internal(h, self->values, values, size)) != GRIB_SUCCESS) {
+        grib_context_buffer_free(c, values);
+        return ret;
+    }
+
+    grib_context_free(c, values);
+
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_decimal_precision.h b/src/accessor/grib_accessor_class_decimal_precision.h
new file mode 100644
index 000000000..455d77946
--- /dev/null
+++ b/src/accessor/grib_accessor_class_decimal_precision.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_decimal_precision_h
+#define eccodes_accessor_decimal_precision_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_decimal_precision_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in decimal_precision */
+    const char* values;
+    const char* bits_per_value;
+    const char* changing_precision;
+    const char* decimal_scale_factor;
+};
+
+class grib_accessor_class_decimal_precision_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_decimal_precision_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_decimal_precision_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_decimal_precision_h */
diff --git a/src/accessor/todo/grib_accessor_class_dictionary.cc b/src/accessor/grib_accessor_class_dictionary.cc
similarity index 62%
rename from src/accessor/todo/grib_accessor_class_dictionary.cc
rename to src/accessor/grib_accessor_class_dictionary.cc
index dde22abdc..e078cde45 100644
--- a/src/accessor/todo/grib_accessor_class_dictionary.cc
+++ b/src/accessor/grib_accessor_class_dictionary.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,113 +10,15 @@
  */
 
 #include "grib_api_internal.h"
+#include "grib_accessor_class_dictionary.h"
 
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = init;dump;unpack_string;unpack_long;unpack_double
-   IMPLEMENTS = value_count; get_native_type;
-   MEMBERS    =  const char* dictionary
-   MEMBERS    =  const char* key
-   MEMBERS    =  long column
-   MEMBERS    =  const char* masterDir
-   MEMBERS    =  const char* localDir
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_dictionary
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in dictionary */
-    const char* dictionary;
-    const char* key;
-    long column;
-    const char* masterDir;
-    const char* localDir;
-} grib_accessor_dictionary;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_dictionary = {
-    &grib_accessor_class_gen,                      /* super */
-    "dictionary",                      /* name */
-    sizeof(grib_accessor_dictionary),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
+grib_accessor_class_dictionary_t _grib_accessor_class_dictionary{"dictionary"};
 grib_accessor_class* grib_accessor_class_dictionary = &_grib_accessor_class_dictionary;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long len, grib_arguments* params)
-{
+void grib_accessor_class_dictionary_t::init(grib_accessor* a, const long len, grib_arguments* params){
     int n                          = 0;
-    grib_accessor_dictionary* self = (grib_accessor_dictionary*)a;
+    grib_accessor_dictionary_t* self = (grib_accessor_dictionary_t*)a;
 
     self->dictionary = grib_arguments_get_string(grib_handle_of_accessor(a), params, n++);
     self->key        = grib_arguments_get_name(grib_handle_of_accessor(a), params, n++);
@@ -129,7 +32,7 @@ static void init(grib_accessor* a, const long len, grib_arguments* params)
 
 static grib_trie* load_dictionary(grib_accessor* a, int* err)
 {
-    grib_accessor_dictionary* self = (grib_accessor_dictionary*)a;
+    grib_accessor_dictionary_t* self = (grib_accessor_dictionary_t*)a;
 
     char* filename  = NULL;
     char line[1024] = {0,};
@@ -243,8 +146,7 @@ static grib_trie* load_dictionary(grib_accessor* a, int* err)
     return dictionary;
 }
 
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
+void grib_accessor_class_dictionary_t::dump(grib_accessor* a, grib_dumper* dumper){
     switch (get_native_type(a)) {
         case GRIB_TYPE_STRING:
             grib_dump_string(dumper, a, NULL);
@@ -258,9 +160,8 @@ static void dump(grib_accessor* a, grib_dumper* dumper)
     }
 }
 
-static int unpack_string(grib_accessor* a, char* buffer, size_t* len)
-{
-    grib_accessor_dictionary* self = (grib_accessor_dictionary*)a;
+int grib_accessor_class_dictionary_t::unpack_string(grib_accessor* a, char* buffer, size_t* len){
+    grib_accessor_dictionary_t* self = (grib_accessor_dictionary_t*)a;
     int err                        = GRIB_SUCCESS;
     char key[1024]                 = {0,};
     size_t size  = 1024;
@@ -313,14 +214,12 @@ static int unpack_string(grib_accessor* a, char* buffer, size_t* len)
     return err;
 }
 
-static int value_count(grib_accessor* a, long* count)
-{
+int grib_accessor_class_dictionary_t::value_count(grib_accessor* a, long* count){
     *count = 1;
     return 0;
 }
 
-static int get_native_type(grib_accessor* a)
-{
+int grib_accessor_class_dictionary_t::get_native_type(grib_accessor* a){
     int type = GRIB_TYPE_DOUBLE;
     if (a->flags & GRIB_ACCESSOR_FLAG_LONG_TYPE)
         type = GRIB_TYPE_LONG;
@@ -329,8 +228,7 @@ static int get_native_type(grib_accessor* a)
     return type;
 }
 
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
+int grib_accessor_class_dictionary_t::unpack_long(grib_accessor* a, long* val, size_t* len){
     int err           = 0;
     char buffer[1024] = {0,};
     size_t size = 1024;
@@ -345,8 +243,7 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
+int grib_accessor_class_dictionary_t::unpack_double(grib_accessor* a, double* val, size_t* len){
     int err           = 0;
     char buffer[1024] = {0,};
     size_t size = 1024;
diff --git a/src/accessor/grib_accessor_class_dictionary.h b/src/accessor/grib_accessor_class_dictionary.h
new file mode 100644
index 000000000..7f86a44ae
--- /dev/null
+++ b/src/accessor/grib_accessor_class_dictionary.h
@@ -0,0 +1,42 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_dictionary_h
+#define eccodes_accessor_dictionary_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_dictionary_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in dictionary */
+    const char* dictionary;
+    const char* key;
+    long column;
+    const char* masterDir;
+    const char* localDir;
+};
+
+class grib_accessor_class_dictionary_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_dictionary_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_dictionary_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_dictionary_h */
diff --git a/src/accessor/grib_accessor_class_dirty.cc b/src/accessor/grib_accessor_class_dirty.cc
new file mode 100644
index 000000000..633c3dee2
--- /dev/null
+++ b/src/accessor/grib_accessor_class_dirty.cc
@@ -0,0 +1,47 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_dirty.h"
+
+grib_accessor_class_dirty_t _grib_accessor_class_dirty{"dirty"};
+grib_accessor_class* grib_accessor_class_dirty = &_grib_accessor_class_dirty;
+
+
+void grib_accessor_class_dirty_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_dirty_t* self = (grib_accessor_dirty_t*)a;
+    self->accessor            = grib_arguments_get_name(grib_handle_of_accessor(a), c, 0);
+    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
+    a->flags |= GRIB_ACCESSOR_FLAG_HIDDEN;
+    a->length = 0;
+}
+
+int grib_accessor_class_dirty_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_dirty_t* self = (grib_accessor_dirty_t*)a;
+    grib_accessor* x          = grib_find_accessor(grib_handle_of_accessor(a), self->accessor);
+
+    if (x)
+        x->dirty = *val;
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_dirty_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_dirty_t* self = (grib_accessor_dirty_t*)a;
+    grib_accessor* x          = grib_find_accessor(grib_handle_of_accessor(a), self->accessor);
+
+    if (x)
+        x->dirty = 1;
+
+    *val = 1;
+
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_dirty.h b/src/accessor/grib_accessor_class_dirty.h
new file mode 100644
index 000000000..7a008ce29
--- /dev/null
+++ b/src/accessor/grib_accessor_class_dirty.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_dirty_h
+#define eccodes_accessor_dirty_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_dirty_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in dirty */
+    const char* accessor;
+};
+
+class grib_accessor_class_dirty_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_dirty_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_dirty_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_dirty_h */
diff --git a/src/accessor/grib_accessor_class_divdouble.cc b/src/accessor/grib_accessor_class_divdouble.cc
new file mode 100644
index 000000000..03a1b63b5
--- /dev/null
+++ b/src/accessor/grib_accessor_class_divdouble.cc
@@ -0,0 +1,43 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_divdouble.h"
+
+grib_accessor_class_divdouble_t _grib_accessor_class_divdouble{"divdouble"};
+grib_accessor_class* grib_accessor_class_divdouble = &_grib_accessor_class_divdouble;
+
+
+void grib_accessor_class_divdouble_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_divdouble_t* self = (grib_accessor_divdouble_t*)a;
+    int n = 0;
+
+    self->val     = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->divisor = grib_arguments_get_double(grib_handle_of_accessor(a), c, n++);
+}
+
+int grib_accessor_class_divdouble_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    const grib_accessor_divdouble_t* self = (grib_accessor_divdouble_t*)a;
+    int ret = GRIB_SUCCESS;
+    double value = 0;
+
+    ret = grib_get_double_internal(grib_handle_of_accessor(a), self->val, &value);
+    if (ret != GRIB_SUCCESS)
+        return ret;
+
+    if (self->divisor == 0) {
+        return GRIB_INVALID_ARGUMENT;
+    }
+    *val = value / self->divisor;
+
+    *len = 1;
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_divdouble.h b/src/accessor/grib_accessor_class_divdouble.h
new file mode 100644
index 000000000..e10239676
--- /dev/null
+++ b/src/accessor/grib_accessor_class_divdouble.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_divdouble_h
+#define eccodes_accessor_divdouble_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_double.h"
+
+class grib_accessor_divdouble_t : public grib_accessor_double_t
+{
+public:
+    /* Members defined in divdouble */
+    const char* val;
+    double divisor;
+};
+
+class grib_accessor_class_divdouble_t : public grib_accessor_class_double_t
+{
+public:
+    grib_accessor_class_divdouble_t(const char* name) : grib_accessor_class_double_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_divdouble_t{}; }
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_divdouble_h */
diff --git a/src/accessor/grib_accessor_class_double.cc b/src/accessor/grib_accessor_class_double.cc
new file mode 100644
index 000000000..2d8e019a7
--- /dev/null
+++ b/src/accessor/grib_accessor_class_double.cc
@@ -0,0 +1,105 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_double.h"
+
+grib_accessor_class_double_t _grib_accessor_class_double{"double"};
+grib_accessor_class* grib_accessor_class_double = &_grib_accessor_class_double;
+
+
+int grib_accessor_class_double_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_DOUBLE;
+}
+
+int grib_accessor_class_double_t::unpack_string(grib_accessor* a, char* v, size_t* len){
+    double val = 0;
+    size_t l   = 1;
+    char repres[1024];
+    char format[32] = "%g";
+    grib_handle* h = grib_handle_of_accessor(a);
+    const char* cclass_name = a->cclass->name;
+
+    a->unpack_double(&val, &l);
+    if ((val == GRIB_MISSING_DOUBLE) && ((a->flags & GRIB_ACCESSOR_FLAG_CAN_BE_MISSING) != 0)) {
+        snprintf(repres, sizeof(repres), "MISSING");
+    } else {
+        size_t size = sizeof(format);
+        grib_get_string(h, "formatForDoubles", format, &size);
+        snprintf(repres, sizeof(repres), format, val);
+    }
+
+    l = strlen(repres) + 1;
+
+    if (l > *len) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
+                         cclass_name, a->name, l, *len);
+        *len = l;
+        return GRIB_BUFFER_TOO_SMALL;
+    }
+    grib_context_log(a->context, GRIB_LOG_DEBUG, "grib_accessor_long: Casting double %s to string  ", a->name);
+
+    *len = l;
+
+    strcpy(v, repres);
+    return GRIB_SUCCESS;
+}
+
+void grib_accessor_class_double_t::dump(grib_accessor* a, grib_dumper* dumper){
+    grib_dump_values(dumper, a);
+}
+
+int grib_accessor_class_double_t::compare(grib_accessor* a, grib_accessor* b){
+    int retval   = 0;
+    double* aval = 0;
+    double* bval = 0;
+
+    size_t alen = 0;
+    size_t blen = 0;
+    long count  = 0;
+    int err     = 0;
+
+    err = a->value_count(&count);    if (err)
+        return err;
+    alen = count;
+
+    err = b->value_count(&count);    if (err)
+        return err;
+    blen = count;
+
+    if (alen != blen)
+        return GRIB_COUNT_MISMATCH;
+
+    aval = (double*)grib_context_malloc(a->context, alen * sizeof(double));
+    bval = (double*)grib_context_malloc(b->context, blen * sizeof(double));
+
+    a->unpack_double(aval, &alen);    b->unpack_double(bval, &blen);
+    retval = GRIB_SUCCESS;
+    while (alen != 0) {
+        if (*bval != *aval)
+            retval = GRIB_DOUBLE_VALUE_MISMATCH;
+        alen--;
+    }
+
+    grib_context_free(a->context, aval);
+    grib_context_free(b->context, bval);
+
+    return retval;
+}
+
+int grib_accessor_class_double_t::pack_missing(grib_accessor* a){
+    size_t len   = 1;
+    double value = GRIB_MISSING_DOUBLE;
+
+    if (a->flags & GRIB_ACCESSOR_FLAG_CAN_BE_MISSING)
+        return a->pack_double(&value, &len);    return GRIB_VALUE_CANNOT_BE_MISSING;
+}
diff --git a/src/accessor/grib_accessor_class_double.h b/src/accessor/grib_accessor_class_double.h
new file mode 100644
index 000000000..865bab9bc
--- /dev/null
+++ b/src/accessor/grib_accessor_class_double.h
@@ -0,0 +1,35 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_double_h
+#define eccodes_accessor_double_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_double_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in double */
+};
+
+class grib_accessor_class_double_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_double_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_double_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_missing(grib_accessor*) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    int compare(grib_accessor*, grib_accessor*) override;
+};
+#endif /* eccodes_accessor_double_h */
diff --git a/src/accessor/todo/grib_accessor_class_element.cc b/src/accessor/grib_accessor_class_element.cc
similarity index 55%
rename from src/accessor/todo/grib_accessor_class_element.cc
rename to src/accessor/grib_accessor_class_element.cc
index 2041cd62d..a393a57aa 100644
--- a/src/accessor/todo/grib_accessor_class_element.cc
+++ b/src/accessor/grib_accessor_class_element.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,104 +10,14 @@
  */
 
 #include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long;pack_long;
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = init
-   MEMBERS=const char*    array
-   MEMBERS=long    element
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_element
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in element */
-    const char*    array;
-    long    element;
-} grib_accessor_element;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_element = {
-    &grib_accessor_class_long,                      /* super */
-    "element",                      /* name */
-    sizeof(grib_accessor_element),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_element.h"
 
+grib_accessor_class_element_t _grib_accessor_class_element{"element"};
 grib_accessor_class* grib_accessor_class_element = &_grib_accessor_class_element;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_element* self = (grib_accessor_element*)a;
+void grib_accessor_class_element_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_element_t* self = (grib_accessor_element_t*)a;
     grib_handle* hand           = grib_handle_of_accessor(a);
 
     int n = 0;
@@ -114,8 +25,7 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
     self->element = grib_arguments_get_long(hand, c, n++);
 }
 
-static int check_element_index(const char* func, const char* array_name, long index, size_t size)
-{
+int check_element_index(const char* func, const char* array_name, long index, size_t size){
     const grib_context* c = grib_context_get_default();
     if (index < 0 || index >= size) {
         grib_context_log(c, GRIB_LOG_ERROR, "%s: Invalid element index %ld for array '%s'. Value must be between 0 and %zu",
@@ -125,9 +35,8 @@ static int check_element_index(const char* func, const char* array_name, long in
     return GRIB_SUCCESS;
 }
 
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_element* self = (grib_accessor_element*)a;
+int grib_accessor_class_element_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_element_t* self = (grib_accessor_element_t*)a;
     int ret                     = 0;
     size_t size                 = 0;
     long* ar                    = NULL;
@@ -168,9 +77,8 @@ the_end:
     return ret;
 }
 
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_element* self = (grib_accessor_element*)a;
+int grib_accessor_class_element_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_element_t* self = (grib_accessor_element_t*)a;
     int ret                     = 0;
     size_t size                 = 0;
     long* ar                    = NULL;
@@ -216,9 +124,8 @@ the_end:
     return ret;
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_element* self = (grib_accessor_element*)a;
+int grib_accessor_class_element_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_element_t* self = (grib_accessor_element_t*)a;
     int ret                     = 0;
     size_t size                 = 0;
     double* ar                  = NULL;
diff --git a/src/accessor/grib_accessor_class_element.h b/src/accessor/grib_accessor_class_element.h
new file mode 100644
index 000000000..f22109be2
--- /dev/null
+++ b/src/accessor/grib_accessor_class_element.h
@@ -0,0 +1,36 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_element_h
+#define eccodes_accessor_element_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_element_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in element */
+    const char*    array;
+    long    element;
+};
+
+class grib_accessor_class_element_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_element_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_element_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_element_h */
diff --git a/src/accessor/grib_accessor_class_evaluate.cc b/src/accessor/grib_accessor_class_evaluate.cc
new file mode 100644
index 000000000..62228b065
--- /dev/null
+++ b/src/accessor/grib_accessor_class_evaluate.cc
@@ -0,0 +1,33 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_evaluate.h"
+
+grib_accessor_class_evaluate_t _grib_accessor_class_evaluate{"evaluate"};
+grib_accessor_class* grib_accessor_class_evaluate = &_grib_accessor_class_evaluate;
+
+
+void grib_accessor_class_evaluate_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_evaluate_t* self = (grib_accessor_evaluate_t*)a;
+    self->arg                    = c;
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+}
+
+int grib_accessor_class_evaluate_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_evaluate_t* self = (grib_accessor_evaluate_t*)a;
+    grib_expression* e = grib_arguments_get_expression(grib_handle_of_accessor(a), self->arg, 0);
+
+    int ret  = grib_expression_evaluate_long(grib_handle_of_accessor(a), e, val);
+    *len = 1;
+
+    return ret;
+}
diff --git a/src/accessor/grib_accessor_class_evaluate.h b/src/accessor/grib_accessor_class_evaluate.h
new file mode 100644
index 000000000..e65c6473b
--- /dev/null
+++ b/src/accessor/grib_accessor_class_evaluate.h
@@ -0,0 +1,33 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_evaluate_h
+#define eccodes_accessor_evaluate_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_evaluate_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in evaluate */
+    grib_arguments* arg;
+};
+
+class grib_accessor_class_evaluate_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_evaluate_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_evaluate_t{}; }
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_evaluate_h */
diff --git a/src/accessor/todo/grib_accessor_class_expanded_descriptors.cc b/src/accessor/grib_accessor_class_expanded_descriptors.cc
similarity index 80%
rename from src/accessor/todo/grib_accessor_class_expanded_descriptors.cc
rename to src/accessor/grib_accessor_class_expanded_descriptors.cc
index 11f4ba73b..8a12d93ff 100644
--- a/src/accessor/todo/grib_accessor_class_expanded_descriptors.cc
+++ b/src/accessor/grib_accessor_class_expanded_descriptors.cc
@@ -1,137 +1,21 @@
+
 /*
-* (C) Copyright 2005- ECMWF.
-*
-* This software is licensed under the terms of the Apache Licence Version 2.0
-* which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-*
-* In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-* virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-*/
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
 
-/* Sequences and replication (not delayed) are resolved in this class.
-   Number of elements to which a delayed replication applies are recomputed to
-   take account of the expansion.
-   Expanded descriptors cannot contain sequences and only delayed replication
-   can appear
-*/
-
-#include "grib_scaling.h"
 #include "grib_api_internal.h"
-/*
-This is used by make_class.pl
-
-START_CLASS_DEF
-CLASS      = accessor
-SUPER      = grib_accessor_class_long
-IMPLEMENTS = unpack_long;pack_long
-IMPLEMENTS = unpack_double
-IMPLEMENTS = unpack_string_array
-IMPLEMENTS = init;destroy
-IMPLEMENTS = value_count; get_native_type
-MEMBERS    = const char* unexpandedDescriptors
-MEMBERS    = const char* sequence
-MEMBERS    = const char* expandedName
-MEMBERS    = const char* tablesAccessorName
-MEMBERS    = bufr_descriptors_array* expanded
-MEMBERS    = int rank
-MEMBERS    = grib_accessor* expandedAccessor
-MEMBERS    = int do_expand
-MEMBERS    = grib_accessor* tablesAccessor
-
-END_CLASS_DEF
-
-*/
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string_array(grib_accessor*, char**, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void destroy(grib_context*, grib_accessor*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_expanded_descriptors
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in expanded_descriptors */
-    const char* unexpandedDescriptors;
-    const char* sequence;
-    const char* expandedName;
-    const char* tablesAccessorName;
-    bufr_descriptors_array* expanded;
-    int rank;
-    grib_accessor* expandedAccessor;
-    int do_expand;
-    grib_accessor* tablesAccessor;
-} grib_accessor_expanded_descriptors;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_expanded_descriptors = {
-    &grib_accessor_class_long,                      /* super */
-    "expanded_descriptors",                      /* name */
-    sizeof(grib_accessor_expanded_descriptors),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    &destroy,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    &unpack_string_array,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_expanded_descriptors.h"
+#include "grib_scaling.h"
 
+grib_accessor_class_expanded_descriptors_t _grib_accessor_class_expanded_descriptors{"expanded_descriptors"};
 grib_accessor_class* grib_accessor_class_expanded_descriptors = &_grib_accessor_class_expanded_descriptors;
 
-/* END_CLASS_IMP */
 
 #define MYDEBUG 0
 #define DESC_SIZE_INIT 400 /* Initial size for grib_bufr_descriptors_array_new */
@@ -158,9 +42,8 @@ typedef struct change_coding_params
         result = grib_bufr_descriptors_array_pop_front(array); \
     }
 
-static void init(grib_accessor* a, const long len, grib_arguments* args)
-{
-    grib_accessor_expanded_descriptors* self = (grib_accessor_expanded_descriptors*)a;
+void grib_accessor_class_expanded_descriptors_t::init(grib_accessor* a, const long len, grib_arguments* args){
+    grib_accessor_expanded_descriptors_t* self = (grib_accessor_expanded_descriptors_t*)a;
     int n = 0;
     grib_handle* hand        = grib_handle_of_accessor(a);
     self->tablesAccessorName = grib_arguments_get_name(hand, args, n++);
@@ -205,10 +88,9 @@ static char* descriptor_type_name(int dtype)
 }
 #endif
 
-static void __expand(grib_accessor* a, bufr_descriptors_array* unexpanded, bufr_descriptors_array* expanded, change_coding_params* ccp, int* err)
-{
+void __expand(grib_accessor* a, bufr_descriptors_array* unexpanded, bufr_descriptors_array* expanded, change_coding_params* ccp, int* err){
     int k, j, i;
-    grib_accessor_expanded_descriptors* self = (grib_accessor_expanded_descriptors*)a;
+    grib_accessor_expanded_descriptors_t* self = (grib_accessor_expanded_descriptors_t*)a;
     size_t size                              = 0;
     long* v_array                            = NULL;
     bufr_descriptor* u                       = NULL;
@@ -581,9 +463,8 @@ static bufr_descriptors_array* do_expand(grib_accessor* a, bufr_descriptors_arra
     return expanded;
 }
 
-static int expand(grib_accessor* a)
-{
-    grib_accessor_expanded_descriptors* self = (grib_accessor_expanded_descriptors*)a;
+int expand(grib_accessor* a){
+    grib_accessor_expanded_descriptors_t* self = (grib_accessor_expanded_descriptors_t*)a;
     int err                                  = 0;
     size_t unexpandedSize                    = 0;
     /* grib_iarray* unexp=0; */
@@ -605,7 +486,7 @@ static int expand(grib_accessor* a)
     self->do_expand = 0;
     if (self->rank != 0) {
         err            = expand(self->expandedAccessor);
-        self->expanded = ((grib_accessor_expanded_descriptors*)self->expandedAccessor)->expanded;
+        self->expanded = ((grib_accessor_expanded_descriptors_t*)self->expandedAccessor)->expanded;
         return err;
     }
 
@@ -706,21 +587,20 @@ static int expand(grib_accessor* a)
 
 int grib_accessor_class_expanded_descriptors_set_do_expand(grib_accessor* a, long do_expand)
 {
-    grib_accessor_expanded_descriptors* self = (grib_accessor_expanded_descriptors*)a;
+    grib_accessor_expanded_descriptors_t* self = (grib_accessor_expanded_descriptors_t*)a;
     self->do_expand = do_expand;
     return 0;
 }
 
 bufr_descriptors_array* grib_accessor_class_expanded_descriptors_get_expanded(grib_accessor* a, int* err)
 {
-    const grib_accessor_expanded_descriptors* self = (grib_accessor_expanded_descriptors*)a;
+    const grib_accessor_expanded_descriptors_t* self = (grib_accessor_expanded_descriptors_t*)a;
     *err = expand(a);
     return self->expanded;
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_expanded_descriptors* self = (grib_accessor_expanded_descriptors*)a;
+int grib_accessor_class_expanded_descriptors_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_expanded_descriptors_t* self = (grib_accessor_expanded_descriptors_t*)a;
     int ret = 0;
     size_t i = 0;
     size_t expandedSize;
@@ -753,9 +633,8 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     return ret;
 }
 
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_expanded_descriptors* self = (grib_accessor_expanded_descriptors*)a;
+int grib_accessor_class_expanded_descriptors_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_expanded_descriptors_t* self = (grib_accessor_expanded_descriptors_t*)a;
     int ret     = 0;
     size_t rlen = 0;
     size_t i    = 0;
@@ -799,8 +678,7 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int unpack_string_array(grib_accessor* a, char** buffer, size_t* len)
-{
+int grib_accessor_class_expanded_descriptors_t::unpack_string_array(grib_accessor* a, char** buffer, size_t* len){
     int err = 0;
     long* v = NULL;
     char buf[25] = {0,};
@@ -808,13 +686,11 @@ static int unpack_string_array(grib_accessor* a, char** buffer, size_t* len)
     size_t i = 0, size = 0;
     const grib_context* c = a->context;
 
-    err = grib_value_count(a, &llen);
-    if (err) return err;
+    err = a->value_count(&llen);    if (err) return err;
 
     size = llen;
     v = (long*)grib_context_malloc_clear(c, sizeof(long) * size);
-    err = grib_unpack_long(a, v, &size);
-    if (err) return err;
+    err = a->unpack_long(v, &size);    if (err) return err;
 
     for (i = 0; i < size; i++) {
         snprintf(buf, sizeof(buf), "%06ld", v[i]);
@@ -826,16 +702,14 @@ static int unpack_string_array(grib_accessor* a, char** buffer, size_t* len)
     return GRIB_NOT_IMPLEMENTED;
 }
 
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_expanded_descriptors* self = (grib_accessor_expanded_descriptors*)a;
+int grib_accessor_class_expanded_descriptors_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_expanded_descriptors_t* self = (grib_accessor_expanded_descriptors_t*)a;
     self->do_expand = 1;
     return GRIB_NOT_IMPLEMENTED;
 }
 
-static int value_count(grib_accessor* a, long* rlen)
-{
-    grib_accessor_expanded_descriptors* self = (grib_accessor_expanded_descriptors*)a;
+int grib_accessor_class_expanded_descriptors_t::value_count(grib_accessor* a, long* rlen){
+    grib_accessor_expanded_descriptors_t* self = (grib_accessor_expanded_descriptors_t*)a;
     int err = 0;
     *rlen   = 0;
 
@@ -849,16 +723,14 @@ static int value_count(grib_accessor* a, long* rlen)
     return err;
 }
 
-static void destroy(grib_context* c, grib_accessor* a)
-{
-    // grib_accessor_expanded_descriptors* self = (grib_accessor_expanded_descriptors*)a;
+void grib_accessor_class_expanded_descriptors_t::destroy(grib_context* c, grib_accessor* a){
+    // grib_accessor_expanded_descriptors_t* self = (grib_accessor_expanded_descriptors_t*)a;
     // if (self->rank==0 && self->expanded)
     //  grib_bufr_descriptors_array_delete(self->expanded);
 }
 
-static int get_native_type(grib_accessor* a)
-{
-    grib_accessor_expanded_descriptors* self = (grib_accessor_expanded_descriptors*)a;
+int grib_accessor_class_expanded_descriptors_t::get_native_type(grib_accessor* a){
+    grib_accessor_expanded_descriptors_t* self = (grib_accessor_expanded_descriptors_t*)a;
     if (self->rank == 2)
         return GRIB_TYPE_DOUBLE;
     else
diff --git a/src/accessor/grib_accessor_class_expanded_descriptors.h b/src/accessor/grib_accessor_class_expanded_descriptors.h
new file mode 100644
index 000000000..be2094d4f
--- /dev/null
+++ b/src/accessor/grib_accessor_class_expanded_descriptors.h
@@ -0,0 +1,47 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_expanded_descriptors_h
+#define eccodes_accessor_expanded_descriptors_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_expanded_descriptors_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in expanded_descriptors */
+    const char* unexpandedDescriptors;
+    const char* sequence;
+    const char* expandedName;
+    const char* tablesAccessorName;
+    bufr_descriptors_array* expanded;
+    int rank;
+    grib_accessor* expandedAccessor;
+    int do_expand;
+    grib_accessor* tablesAccessor;
+};
+
+class grib_accessor_class_expanded_descriptors_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_expanded_descriptors_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_expanded_descriptors_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string_array(grib_accessor*, char**, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void destroy(grib_context*, grib_accessor*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_expanded_descriptors_h */
diff --git a/src/accessor/todo/grib_accessor_class_from_scale_factor_scaled_value.cc b/src/accessor/grib_accessor_class_from_scale_factor_scaled_value.cc
similarity index 59%
rename from src/accessor/todo/grib_accessor_class_from_scale_factor_scaled_value.cc
rename to src/accessor/grib_accessor_class_from_scale_factor_scaled_value.cc
index 53784e172..3ba6e198e 100644
--- a/src/accessor/todo/grib_accessor_class_from_scale_factor_scaled_value.cc
+++ b/src/accessor/grib_accessor_class_from_scale_factor_scaled_value.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,110 +10,14 @@
  */
 
 #include "grib_api_internal.h"
-#include <cmath>
-#ifdef ECCODES_ON_WINDOWS
- #include <stdint.h>
-#endif
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_double
-   IMPLEMENTS = unpack_double;pack_double;is_missing
-   IMPLEMENTS = value_count
-   IMPLEMENTS = init
-   MEMBERS=const char*    scaleFactor
-   MEMBERS=const char*    scaledValue
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int is_missing(grib_accessor*);
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_from_scale_factor_scaled_value
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in from_scale_factor_scaled_value */
-    const char*    scaleFactor;
-    const char*    scaledValue;
-} grib_accessor_from_scale_factor_scaled_value;
-
-extern grib_accessor_class* grib_accessor_class_double;
-
-static grib_accessor_class _grib_accessor_class_from_scale_factor_scaled_value = {
-    &grib_accessor_class_double,                      /* super */
-    "from_scale_factor_scaled_value",                      /* name */
-    sizeof(grib_accessor_from_scale_factor_scaled_value),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    &is_missing,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_from_scale_factor_scaled_value.h"
 
+grib_accessor_class_from_scale_factor_scaled_value_t _grib_accessor_class_from_scale_factor_scaled_value{"from_scale_factor_scaled_value"};
 grib_accessor_class* grib_accessor_class_from_scale_factor_scaled_value = &_grib_accessor_class_from_scale_factor_scaled_value;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_from_scale_factor_scaled_value* self = (grib_accessor_from_scale_factor_scaled_value*)a;
+void grib_accessor_class_from_scale_factor_scaled_value_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_from_scale_factor_scaled_value_t* self = (grib_accessor_from_scale_factor_scaled_value_t*)a;
     int n                                              = 0;
     grib_handle* hand                                  = grib_handle_of_accessor(a);
 
@@ -123,11 +28,10 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
     // a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
 }
 
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
+int grib_accessor_class_from_scale_factor_scaled_value_t::pack_double(grib_accessor* a, const double* val, size_t* len){
     // See ECC-979 and ECC-1416
     // Evaluate self->scaleFactor and self->scaledValue from input double '*val'
-    grib_accessor_from_scale_factor_scaled_value* self = (grib_accessor_from_scale_factor_scaled_value*)a;
+    grib_accessor_from_scale_factor_scaled_value_t* self = (grib_accessor_from_scale_factor_scaled_value_t*)a;
     grib_handle* hand                                  = grib_handle_of_accessor(a);
     int err                                            = 0;
     int64_t factor = 0;
@@ -181,9 +85,8 @@ static int pack_double(grib_accessor* a, const double* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_from_scale_factor_scaled_value* self = (grib_accessor_from_scale_factor_scaled_value*)a;
+int grib_accessor_class_from_scale_factor_scaled_value_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_from_scale_factor_scaled_value_t* self = (grib_accessor_from_scale_factor_scaled_value_t*)a;
     int err = 0;
     long scaleFactor = 0, scaledValue = 0;
     grib_handle* hand = grib_handle_of_accessor(a);
@@ -257,9 +160,8 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     return err;
 }
 
-static int is_missing(grib_accessor* a)
-{
-    grib_accessor_from_scale_factor_scaled_value* self = (grib_accessor_from_scale_factor_scaled_value*)a;
+int grib_accessor_class_from_scale_factor_scaled_value_t::is_missing(grib_accessor* a){
+    grib_accessor_from_scale_factor_scaled_value_t* self = (grib_accessor_from_scale_factor_scaled_value_t*)a;
     grib_handle* hand = grib_handle_of_accessor(a);
     int err = 0;
     long scaleFactor = 0, scaledValue = 0;
@@ -273,9 +175,8 @@ static int is_missing(grib_accessor* a)
     return ((scaleFactor == GRIB_MISSING_LONG) || (scaledValue == GRIB_MISSING_LONG));
 }
 
-static int value_count(grib_accessor* a, long* len)
-{
-    grib_accessor_from_scale_factor_scaled_value* self = (grib_accessor_from_scale_factor_scaled_value*)a;
+int grib_accessor_class_from_scale_factor_scaled_value_t::value_count(grib_accessor* a, long* len){
+    grib_accessor_from_scale_factor_scaled_value_t* self = (grib_accessor_from_scale_factor_scaled_value_t*)a;
     int err = 0;
     grib_handle* hand = grib_handle_of_accessor(a);
     size_t vsize;
diff --git a/src/accessor/grib_accessor_class_from_scale_factor_scaled_value.h b/src/accessor/grib_accessor_class_from_scale_factor_scaled_value.h
new file mode 100644
index 000000000..1874c559f
--- /dev/null
+++ b/src/accessor/grib_accessor_class_from_scale_factor_scaled_value.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_from_scale_factor_scaled_value_h
+#define eccodes_accessor_from_scale_factor_scaled_value_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_double.h"
+
+class grib_accessor_from_scale_factor_scaled_value_t : public grib_accessor_double_t
+{
+public:
+    /* Members defined in from_scale_factor_scaled_value */
+    const char*    scaleFactor;
+    const char*    scaledValue;
+};
+
+class grib_accessor_class_from_scale_factor_scaled_value_t : public grib_accessor_class_double_t
+{
+public:
+    grib_accessor_class_from_scale_factor_scaled_value_t(const char* name) : grib_accessor_class_double_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_from_scale_factor_scaled_value_t{}; }
+    int is_missing(grib_accessor*) override;
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_from_scale_factor_scaled_value_h */
diff --git a/src/accessor/grib_accessor_class_g1_half_byte_codeflag.cc b/src/accessor/grib_accessor_class_g1_half_byte_codeflag.cc
new file mode 100644
index 000000000..cf115535f
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g1_half_byte_codeflag.cc
@@ -0,0 +1,60 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_g1_half_byte_codeflag.h"
+
+grib_accessor_class_g1_half_byte_codeflag_t _grib_accessor_class_g1_half_byte_codeflag{"g1_half_byte_codeflag"};
+grib_accessor_class* grib_accessor_class_g1_half_byte_codeflag = &_grib_accessor_class_g1_half_byte_codeflag;
+
+
+void grib_accessor_class_g1_half_byte_codeflag_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    a->length = 0;
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->flags |= GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC;
+}
+
+void grib_accessor_class_g1_half_byte_codeflag_t::dump(grib_accessor* a, grib_dumper* dumper){
+    grib_dump_long(dumper, a, NULL);
+}
+
+int grib_accessor_class_g1_half_byte_codeflag_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    unsigned char dat = 0;
+    if (*len < 1) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s it contains %d values ", a->name, 1);
+        *len = 0;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+    dat = grib_handle_of_accessor(a)->buffer->data[a->offset] & 0x0f;
+
+    *val = dat;
+    *len = 1;
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_g1_half_byte_codeflag_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    int ret = 0;
+    if (*len < 1) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s it contains %d values ", a->name, 1);
+        *len = 0;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+    /*  printf("HALF BYTE pack long %ld %02x\n",*val,grib_handle_of_accessor(a)->buffer->data[a->offset]);*/
+    grib_handle_of_accessor(a)->buffer->data[a->offset] = (a->parent->h->buffer->data[a->offset] & 0xf0) | (*val & 0x0f);
+    /*  printf("HALF BYTE pack long %ld %02x\n",*val,grib_handle_of_accessor(a)->buffer->data[a->offset]);*/
+
+    *len = 1;
+    return ret;
+}
+
+int grib_accessor_class_g1_half_byte_codeflag_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_LONG;
+}
diff --git a/src/accessor/grib_accessor_class_g1_half_byte_codeflag.h b/src/accessor/grib_accessor_class_g1_half_byte_codeflag.h
new file mode 100644
index 000000000..9c5890aa3
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g1_half_byte_codeflag.h
@@ -0,0 +1,35 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g1_half_byte_codeflag_h
+#define eccodes_accessor_g1_half_byte_codeflag_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_g1_half_byte_codeflag_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in g1_half_byte_codeflag */
+};
+
+class grib_accessor_class_g1_half_byte_codeflag_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_g1_half_byte_codeflag_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g1_half_byte_codeflag_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_g1_half_byte_codeflag_h */
diff --git a/src/accessor/todo/grib_accessor_class_g1_message_length.cc b/src/accessor/grib_accessor_class_g1_message_length.cc
similarity index 53%
rename from src/accessor/todo/grib_accessor_class_g1_message_length.cc
rename to src/accessor/grib_accessor_class_g1_message_length.cc
index 1d38e7ea4..9b318b6a0 100644
--- a/src/accessor/todo/grib_accessor_class_g1_message_length.cc
+++ b/src/accessor/grib_accessor_class_g1_message_length.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,103 +10,14 @@
  */
 
 #include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_section_length
-   IMPLEMENTS = init;unpack_long;pack_long
-   MEMBERS    = const char *sec4_length
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_g1_message_length
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in unsigned */
-    long nbytes;
-    grib_arguments* arg;
-    /* Members defined in section_length */
-    /* Members defined in g1_message_length */
-    const char *sec4_length;
-} grib_accessor_g1_message_length;
-
-extern grib_accessor_class* grib_accessor_class_section_length;
-
-static grib_accessor_class _grib_accessor_class_g1_message_length = {
-    &grib_accessor_class_section_length,                      /* super */
-    "g1_message_length",                      /* name */
-    sizeof(grib_accessor_g1_message_length),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_g1_message_length.h"
 
+grib_accessor_class_g1_message_length_t _grib_accessor_class_g1_message_length{"g1_message_length"};
 grib_accessor_class* grib_accessor_class_g1_message_length = &_grib_accessor_class_g1_message_length;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long len, grib_arguments* args)
-{
-    grib_accessor_g1_message_length* self = (grib_accessor_g1_message_length*)a;
+void grib_accessor_class_g1_message_length_t::init(grib_accessor* a, const long len, grib_arguments* args){
+    grib_accessor_g1_message_length_t* self = (grib_accessor_g1_message_length_t*)a;
     self->sec4_length = grib_arguments_get_name(grib_handle_of_accessor(a), args, 0);
 }
 
@@ -148,9 +60,8 @@ int grib_get_g1_message_size(grib_handle* h, grib_accessor* tl, grib_accessor* s
     return GRIB_SUCCESS;
 }
 
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_g1_message_length* self = (grib_accessor_g1_message_length*)a;
+int grib_accessor_class_g1_message_length_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_g1_message_length_t* self = (grib_accessor_g1_message_length_t*)a;
     /*grib_accessor_class* super = *(a->cclass->super);*/
 
     /* Here we assume that the totalLength will be coded AFTER the section4 length, and
@@ -182,7 +93,7 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
     tlen = 0x800000 | t120;
 
     *len = 1;
-    if ((ret = grib_pack_long(s4, &slen, len)) != GRIB_SUCCESS)
+    if ((ret = s4->pack_long(&slen, len)) != GRIB_SUCCESS)
         return ret;
 
     *len = 1;
@@ -211,9 +122,8 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_g1_message_length* self = (grib_accessor_g1_message_length*)a;
+int grib_accessor_class_g1_message_length_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_g1_message_length_t* self = (grib_accessor_g1_message_length_t*)a;
     int ret;
     long total_length, sec4_length;
 
diff --git a/src/accessor/grib_accessor_class_g1_message_length.h b/src/accessor/grib_accessor_class_g1_message_length.h
new file mode 100644
index 000000000..c3b865ec0
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g1_message_length.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g1_message_length_h
+#define eccodes_accessor_g1_message_length_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_section_length.h"
+
+class grib_accessor_g1_message_length_t : public grib_accessor_section_length_t
+{
+public:
+    /* Members defined in g1_message_length */
+    const char *sec4_length;
+};
+
+class grib_accessor_class_g1_message_length_t : public grib_accessor_class_section_length_t
+{
+public:
+    grib_accessor_class_g1_message_length_t(const char* name) : grib_accessor_class_section_length_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g1_message_length_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_g1_message_length_h */
diff --git a/src/accessor/grib_accessor_class_g1_section4_length.cc b/src/accessor/grib_accessor_class_g1_section4_length.cc
new file mode 100644
index 000000000..858ef0d69
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g1_section4_length.cc
@@ -0,0 +1,53 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_g1_section4_length.h"
+
+grib_accessor_class_g1_section4_length_t _grib_accessor_class_g1_section4_length{"g1_section4_length"};
+grib_accessor_class* grib_accessor_class_g1_section4_length = &_grib_accessor_class_g1_section4_length;
+
+
+void grib_accessor_class_g1_section4_length_t::init(grib_accessor* a, const long len, grib_arguments* args){
+    grib_accessor_g1_section4_length_t* self = (grib_accessor_g1_section4_length_t*)a;
+    self->total_length                     = grib_arguments_get_name(grib_handle_of_accessor(a), args, 0);
+}
+
+int grib_accessor_class_g1_section4_length_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    // Old implementation:
+    //   Here we assume that the totalLength will be coded AFTER the section4 length, and
+    //   the section4 length will be overwritten by the totalLength accessor for large GRIBs
+    //    grib_accessor_class* super = *(a->cclass->super);
+    //    return super->pack_long(a,val,len);
+
+    // Note: Do not directly call pack_long on base class
+    // because in this special case we want to skip the checks.
+    // So we call the helper function which has an extra argument
+    return pack_long_unsigned_helper(a, val, len, /*check=*/0);
+}
+
+int grib_accessor_class_g1_section4_length_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_g1_section4_length_t* self = (grib_accessor_g1_section4_length_t*)a;
+    int ret = 0;
+    long total_length = 0, sec4_length = 0;
+
+    if ((ret = grib_get_g1_message_size(grib_handle_of_accessor(a),
+                                        grib_find_accessor(grib_handle_of_accessor(a), self->total_length),
+                                        a,
+                                        &total_length,
+                                        &sec4_length)) != GRIB_SUCCESS) {
+        return ret;
+    }
+
+    *val = sec4_length;
+
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_g1_section4_length.h b/src/accessor/grib_accessor_class_g1_section4_length.h
new file mode 100644
index 000000000..0a1b0c768
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g1_section4_length.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g1_section4_length_h
+#define eccodes_accessor_g1_section4_length_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_section_length.h"
+
+class grib_accessor_g1_section4_length_t : public grib_accessor_section_length_t
+{
+public:
+    /* Members defined in g1_section4_length */
+    const char* total_length;
+};
+
+class grib_accessor_class_g1_section4_length_t : public grib_accessor_class_section_length_t
+{
+public:
+    grib_accessor_class_g1_section4_length_t(const char* name) : grib_accessor_class_section_length_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g1_section4_length_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_g1_section4_length_h */
diff --git a/src/accessor/grib_accessor_class_g1bitmap.cc b/src/accessor/grib_accessor_class_g1bitmap.cc
new file mode 100644
index 000000000..ad186dff0
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g1bitmap.cc
@@ -0,0 +1,98 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_g1bitmap.h"
+#include "shared_functions.h"
+
+grib_accessor_class_g1bitmap_t _grib_accessor_class_g1bitmap{"g1bitmap"};
+grib_accessor_class* grib_accessor_class_g1bitmap = &_grib_accessor_class_g1bitmap;
+
+
+void grib_accessor_class_g1bitmap_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    grib_accessor_g1bitmap_t* self = (grib_accessor_g1bitmap_t*)a;
+    self->unusedBits             = grib_arguments_get_name(grib_handle_of_accessor(a), arg, 4);
+}
+
+int grib_accessor_class_g1bitmap_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_g1bitmap_t* self = (grib_accessor_g1bitmap_t*)a;
+    size_t tlen;
+
+    unsigned char* buf = NULL;
+    size_t i;
+    int err               = 0;
+    long pos              = 0;
+    //long bmaplen          = 0;
+    const int bit_padding = 16;
+    double miss_values    = 0;
+    tlen                  = ((*len + bit_padding - 1) / bit_padding * bit_padding) / 8;
+
+    if ((err = grib_get_double_internal(grib_handle_of_accessor(a), self->missing_value, &miss_values)) != GRIB_SUCCESS)
+        return err;
+
+    buf = (unsigned char*)grib_context_malloc_clear(a->context, tlen);
+    if (!buf)
+        return GRIB_OUT_OF_MEMORY;
+    pos = 0;
+    for (i = 0; i < *len; i++) {
+        if (val[i] == miss_values)
+            pos++;
+        else {
+            //bmaplen++;
+            grib_set_bit_on(buf, &pos);
+        }
+    }
+
+    if ((err = grib_set_long_internal(grib_handle_of_accessor(a), self->unusedBits, tlen * 8 - *len)) != GRIB_SUCCESS)
+        return err;
+
+    err = grib_buffer_replace(a, buf, tlen, 1, 1);
+    if (err) return err;
+
+    grib_context_free(a->context, buf);
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_g1bitmap_t::value_count(grib_accessor* a, long* count){
+    grib_accessor_g1bitmap_t* self = (grib_accessor_g1bitmap_t*)a;
+    long tlen;
+    int err;
+
+    if ((err = grib_get_long_internal(grib_handle_of_accessor(a), self->unusedBits, &tlen)) != GRIB_SUCCESS)
+        grib_context_log(a->context, GRIB_LOG_ERROR, "grib_accessor_class_bitmap.value_count : cannot get %s err=%d", self->unusedBits, err);
+
+    *count = (a->length * 8) - tlen;
+    return err;
+}
+
+int grib_accessor_class_g1bitmap_t::unpack_bytes(grib_accessor* a, unsigned char* val, size_t* len){
+    unsigned char* buf           = grib_handle_of_accessor(a)->buffer->data;
+    grib_accessor_g1bitmap_t* self = (grib_accessor_g1bitmap_t*)a;
+    long tlen;
+    int err;
+    long length = a->byte_count();    long offset = a->byte_offset();
+    if (*len < (size_t)length) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s it is %ld bytes long\n", a->name, length);
+        *len = length;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    if ((err = grib_get_long_internal(grib_handle_of_accessor(a), self->unusedBits, &tlen)) != GRIB_SUCCESS)
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "grib_accessor_class_bitmap.unpack_bytes : cannot get %s err=%d", self->unusedBits, err);
+
+    length -= tlen / 8;
+    memcpy(val, buf + offset, length);
+    *len = length;
+
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_g1bitmap.h b/src/accessor/grib_accessor_class_g1bitmap.h
new file mode 100644
index 000000000..b34344d1f
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g1bitmap.h
@@ -0,0 +1,35 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g1bitmap_h
+#define eccodes_accessor_g1bitmap_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_bitmap.h"
+
+class grib_accessor_g1bitmap_t : public grib_accessor_bitmap_t
+{
+public:
+    /* Members defined in g1bitmap */
+    const char* unusedBits;
+};
+
+class grib_accessor_class_g1bitmap_t : public grib_accessor_class_bitmap_t
+{
+public:
+    grib_accessor_class_g1bitmap_t(const char* name) : grib_accessor_class_bitmap_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g1bitmap_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_bytes(grib_accessor*, unsigned char*, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_g1bitmap_h */
diff --git a/src/accessor/todo/grib_accessor_class_g1date.cc b/src/accessor/grib_accessor_class_g1date.cc
similarity index 51%
rename from src/accessor/todo/grib_accessor_class_g1date.cc
rename to src/accessor/grib_accessor_class_g1date.cc
index c53b3768a..de787abba 100644
--- a/src/accessor/todo/grib_accessor_class_g1date.cc
+++ b/src/accessor/grib_accessor_class_g1date.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,109 +10,14 @@
  */
 
 #include "grib_api_internal.h"
+#include "grib_accessor_class_g1date.h"
 
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long;pack_long;unpack_string
-   IMPLEMENTS = init;value_count
-   MEMBERS=const char* century
-   MEMBERS=const char* year
-   MEMBERS=const char* month
-   MEMBERS=const char* day
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_g1date
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in g1date */
-    const char* century;
-    const char* year;
-    const char* month;
-    const char* day;
-} grib_accessor_g1date;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_g1date = {
-    &grib_accessor_class_long,                      /* super */
-    "g1date",                      /* name */
-    sizeof(grib_accessor_g1date),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
+grib_accessor_class_g1date_t _grib_accessor_class_g1date{"g1date"};
 grib_accessor_class* grib_accessor_class_g1date = &_grib_accessor_class_g1date;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_g1date* self = (grib_accessor_g1date*)a;
+void grib_accessor_class_g1date_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_g1date_t* self = (grib_accessor_g1date_t*)a;
     grib_handle* hand          = grib_handle_of_accessor(a);
     int n                      = 0;
 
@@ -121,9 +27,8 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
     self->day     = grib_arguments_get_name(hand, c, n++);
 }
 
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_g1date* self = (grib_accessor_g1date*)a;
+int grib_accessor_class_g1date_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_g1date_t* self = (grib_accessor_g1date_t*)a;
     grib_handle* hand = grib_handle_of_accessor(a);
 
     int ret = 0;
@@ -154,9 +59,8 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_g1date* self = (grib_accessor_g1date*)a;
+int grib_accessor_class_g1date_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_g1date_t* self = (grib_accessor_g1date_t*)a;
     grib_handle* hand = grib_handle_of_accessor(a);
 
     int ret = 0;
@@ -168,7 +72,7 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
 
     long d = grib_julian_to_date(grib_date_to_julian(v));
     if (v != d) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "grib_accessor_g1date: pack_long invalid date %ld, changed to %ld", v, d);
+        grib_context_log(a->context, GRIB_LOG_ERROR, "grib_accessor_g1date_t: pack_long invalid date %ld, changed to %ld", v, d);
         return GRIB_ENCODING_ERROR;
     }
 
@@ -212,9 +116,8 @@ static const char* months[] = {
     "dec",
 };
 
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    grib_accessor_g1date* self = (grib_accessor_g1date*)a;
+int grib_accessor_class_g1date_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    grib_accessor_g1date_t* self = (grib_accessor_g1date_t*)a;
     grib_handle* hand          = grib_handle_of_accessor(a);
 
     int ret = 0;
@@ -256,8 +159,7 @@ static int unpack_string(grib_accessor* a, char* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int value_count(grib_accessor* a, long* count)
-{
+int grib_accessor_class_g1date_t::value_count(grib_accessor* a, long* count){
     *count = 1;
     return 0;
 }
diff --git a/src/accessor/grib_accessor_class_g1date.h b/src/accessor/grib_accessor_class_g1date.h
new file mode 100644
index 000000000..27e71189f
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g1date.h
@@ -0,0 +1,39 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g1date_h
+#define eccodes_accessor_g1date_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_g1date_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in g1date */
+    const char* century;
+    const char* year;
+    const char* month;
+    const char* day;
+};
+
+class grib_accessor_class_g1date_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_g1date_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g1date_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_g1date_h */
diff --git a/src/accessor/grib_accessor_class_g1day_of_the_year_date.cc b/src/accessor/grib_accessor_class_g1day_of_the_year_date.cc
new file mode 100644
index 000000000..9bf107e94
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g1day_of_the_year_date.cc
@@ -0,0 +1,60 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_g1day_of_the_year_date.h"
+
+grib_accessor_class_g1day_of_the_year_date_t _grib_accessor_class_g1day_of_the_year_date{"g1day_of_the_year_date"};
+grib_accessor_class* grib_accessor_class_g1day_of_the_year_date = &_grib_accessor_class_g1day_of_the_year_date;
+
+
+
+void grib_accessor_class_g1day_of_the_year_date_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+}
+
+void grib_accessor_class_g1day_of_the_year_date_t::dump(grib_accessor* a, grib_dumper* dumper){
+    grib_dump_string(dumper, a, NULL);
+}
+
+int grib_accessor_class_g1day_of_the_year_date_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    /* special clim case where each mont have 30 days.. to comply with mars*/
+    grib_accessor_g1day_of_the_year_date_t* self = (grib_accessor_g1day_of_the_year_date_t*)a;
+    grib_handle* hand = grib_handle_of_accessor(a);
+    char tmp[1024];
+
+    long year    = 0;
+    long century = 0;
+    long month   = 0;
+    long day     = 0;
+    long fullyear = 0;
+    long fake_day_of_year = 0;
+
+    grib_get_long_internal(hand, self->century, &century);
+    grib_get_long_internal(hand, self->day, &day);
+    grib_get_long_internal(hand, self->month, &month);
+    grib_get_long_internal(hand, self->year, &year);
+
+    fullyear = ((century - 1) * 100 + year);
+    fake_day_of_year = ((month - 1) * 30) + day;
+    snprintf(tmp, sizeof(tmp), "%04ld-%03ld", fullyear, fake_day_of_year);
+
+    size_t l = strlen(tmp) + 1;
+    if (*len < l) {
+        *len = l;
+        return GRIB_BUFFER_TOO_SMALL;
+    }
+
+    *len = l;
+    strcpy(val, tmp);
+
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_g1day_of_the_year_date.h b/src/accessor/grib_accessor_class_g1day_of_the_year_date.h
new file mode 100644
index 000000000..1563cdb9d
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g1day_of_the_year_date.h
@@ -0,0 +1,33 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g1day_of_the_year_date_h
+#define eccodes_accessor_g1day_of_the_year_date_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_g1date.h"
+
+class grib_accessor_g1day_of_the_year_date_t : public grib_accessor_g1date_t
+{
+public:
+    /* Members defined in g1day_of_the_year_date */
+};
+
+class grib_accessor_class_g1day_of_the_year_date_t : public grib_accessor_class_g1date_t
+{
+public:
+    grib_accessor_class_g1day_of_the_year_date_t(const char* name) : grib_accessor_class_g1date_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g1day_of_the_year_date_t{}; }
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_g1day_of_the_year_date_h */
diff --git a/src/accessor/grib_accessor_class_g1end_of_interval_monthly.cc b/src/accessor/grib_accessor_class_g1end_of_interval_monthly.cc
new file mode 100644
index 000000000..c362016b1
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g1end_of_interval_monthly.cc
@@ -0,0 +1,135 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_g1end_of_interval_monthly.h"
+
+grib_accessor_class_g1end_of_interval_monthly_t _grib_accessor_class_g1end_of_interval_monthly{"g1end_of_interval_monthly"};
+grib_accessor_class* grib_accessor_class_g1end_of_interval_monthly = &_grib_accessor_class_g1end_of_interval_monthly;
+
+
+void grib_accessor_class_g1end_of_interval_monthly_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_g1end_of_interval_monthly_t* self = (grib_accessor_g1end_of_interval_monthly_t*)a;
+    int n                                         = 0;
+
+    self->verifyingMonth = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
+    a->flags |= GRIB_ACCESSOR_FLAG_HIDDEN;
+
+    self->number_of_elements = 6;
+    self->v = (double*)grib_context_malloc(a->context, sizeof(double) * self->number_of_elements);
+
+    a->length = 0;
+    a->dirty  = 1;
+}
+
+int grib_accessor_class_g1end_of_interval_monthly_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_g1end_of_interval_monthly_t* self = (grib_accessor_g1end_of_interval_monthly_t*)a;
+    int ret = 0;
+    char verifyingMonth[7] = {0,};
+    size_t slen = 7;
+    long year = 0, month = 0, date = 0;
+    const long mdays[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+    long days    = 0;
+
+    if (!a->dirty)
+        return GRIB_SUCCESS;
+
+    if (*len != (size_t)self->number_of_elements)
+        return GRIB_ARRAY_TOO_SMALL;
+
+    if ((ret = grib_get_string(grib_handle_of_accessor(a), self->verifyingMonth, verifyingMonth, &slen)) != GRIB_SUCCESS)
+        return ret;
+
+    date  = atoi(verifyingMonth);
+    if (date < 0) {
+        return GRIB_INVALID_ARGUMENT;
+    }
+    year  = date / 100;
+    month = date - year * 100;
+    if (month == 2) {
+        days = 28;
+        if (year % 400 == 0 || (year % 4 == 0 && year % 100 != 0))
+            days = 29;
+    }
+    else {
+        if (month < 1 || month > 12) return GRIB_INVALID_ARGUMENT;
+        days = mdays[month - 1];
+    }
+    self->v[0] = year;
+    self->v[1] = month;
+
+    self->v[2] = days;
+    self->v[3] = 24;
+    self->v[4] = 00;
+    self->v[5] = 00;
+
+    a->dirty = 0;
+
+    val[0] = self->v[0];
+    val[1] = self->v[1];
+    val[2] = self->v[2];
+    val[3] = self->v[3];
+    val[4] = self->v[4];
+    val[5] = self->v[5];
+
+    return ret;
+}
+
+int grib_accessor_class_g1end_of_interval_monthly_t::value_count(grib_accessor* a, long* count){
+    grib_accessor_g1end_of_interval_monthly_t* self = (grib_accessor_g1end_of_interval_monthly_t*)a;
+    *count                                        = self->number_of_elements;
+    return 0;
+}
+
+void grib_accessor_class_g1end_of_interval_monthly_t::destroy(grib_context* c, grib_accessor* a){
+    grib_accessor_g1end_of_interval_monthly_t* self = (grib_accessor_g1end_of_interval_monthly_t*)a;
+    grib_context_free(c, self->v);
+}
+
+int grib_accessor_class_g1end_of_interval_monthly_t::compare(grib_accessor* a, grib_accessor* b){
+    int retval   = GRIB_SUCCESS;
+    double* aval = 0;
+    double* bval = 0;
+
+    long count  = 0;
+    size_t alen = 0;
+    size_t blen = 0;
+    int err     = 0;
+
+    err = a->value_count(&count);    if (err)
+        return err;
+    alen = count;
+
+    err = b->value_count(&count);    if (err)
+        return err;
+    blen = count;
+
+    if (alen != blen)
+        return GRIB_COUNT_MISMATCH;
+
+    aval = (double*)grib_context_malloc(a->context, alen * sizeof(double));
+    bval = (double*)grib_context_malloc(b->context, blen * sizeof(double));
+
+    b->dirty = 1;
+    a->dirty = 1;
+
+    err = a->unpack_double(aval, &alen);    err = b->unpack_double(bval, &blen);
+    for(size_t i=0; i<alen && retval == GRIB_SUCCESS; ++i) {
+        if (aval[i] != bval[i]) retval = GRIB_DOUBLE_VALUE_MISMATCH;
+    }
+
+    grib_context_free(a->context, aval);
+    grib_context_free(b->context, bval);
+
+    return retval;
+}
diff --git a/src/accessor/grib_accessor_class_g1end_of_interval_monthly.h b/src/accessor/grib_accessor_class_g1end_of_interval_monthly.h
new file mode 100644
index 000000000..a1e29a76c
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g1end_of_interval_monthly.h
@@ -0,0 +1,36 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g1end_of_interval_monthly_h
+#define eccodes_accessor_g1end_of_interval_monthly_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_abstract_vector.h"
+
+class grib_accessor_g1end_of_interval_monthly_t : public grib_accessor_abstract_vector_t
+{
+public:
+    /* Members defined in g1end_of_interval_monthly */
+    const char* verifyingMonth;
+};
+
+class grib_accessor_class_g1end_of_interval_monthly_t : public grib_accessor_class_abstract_vector_t
+{
+public:
+    grib_accessor_class_g1end_of_interval_monthly_t(const char* name) : grib_accessor_class_abstract_vector_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g1end_of_interval_monthly_t{}; }
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void destroy(grib_context*, grib_accessor*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    int compare(grib_accessor*, grib_accessor*) override;
+};
+#endif /* eccodes_accessor_g1end_of_interval_monthly_h */
diff --git a/src/accessor/grib_accessor_class_g1fcperiod.cc b/src/accessor/grib_accessor_class_g1fcperiod.cc
new file mode 100644
index 000000000..143a381e7
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g1fcperiod.cc
@@ -0,0 +1,42 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_g1fcperiod.h"
+
+grib_accessor_class_g1fcperiod_t _grib_accessor_class_g1fcperiod{"g1fcperiod"};
+grib_accessor_class* grib_accessor_class_g1fcperiod = &_grib_accessor_class_g1fcperiod;
+
+
+int grib_accessor_class_g1fcperiod_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    long start = 0, theEnd = 0;
+    char tmp[1024];
+    const size_t tmpLen = sizeof(tmp);
+    int err  = grib_g1_step_get_steps(a, &start, &theEnd);
+    size_t l = 0;
+
+    if (err)
+        return err;
+
+    snprintf(tmp, tmpLen, "%ld-%ld", start / 24, theEnd / 24);
+    /*printf("---- FCPERIOD %s [start:%g, end:%g]",tmp,start,end);*/
+
+    l = strlen(tmp) + 1;
+    if (*len < l) {
+        *len = l;
+        return GRIB_BUFFER_TOO_SMALL;
+    }
+
+    *len = l;
+    strcpy(val, tmp); /* NOLINT: CWE-119 clang-analyzer-security.insecureAPI.strcpy */
+
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_g1fcperiod.h b/src/accessor/grib_accessor_class_g1fcperiod.h
new file mode 100644
index 000000000..3c0ff2c49
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g1fcperiod.h
@@ -0,0 +1,31 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g1fcperiod_h
+#define eccodes_accessor_g1fcperiod_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_g1step_range.h"
+
+class grib_accessor_g1fcperiod_t : public grib_accessor_g1step_range_t
+{
+public:
+    /* Members defined in g1fcperiod */
+};
+
+class grib_accessor_class_g1fcperiod_t : public grib_accessor_class_g1step_range_t
+{
+public:
+    grib_accessor_class_g1fcperiod_t(const char* name) : grib_accessor_class_g1step_range_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g1fcperiod_t{}; }
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+};
+#endif /* eccodes_accessor_g1fcperiod_h */
diff --git a/src/accessor/todo/grib_accessor_class_g1forecastmonth.cc b/src/accessor/grib_accessor_class_g1forecastmonth.cc
similarity index 58%
rename from src/accessor/todo/grib_accessor_class_g1forecastmonth.cc
rename to src/accessor/grib_accessor_class_g1forecastmonth.cc
index e25db6930..f0a0e86db 100644
--- a/src/accessor/todo/grib_accessor_class_g1forecastmonth.cc
+++ b/src/accessor/grib_accessor_class_g1forecastmonth.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,112 +10,14 @@
  */
 
 #include "grib_api_internal.h"
+#include "grib_accessor_class_g1forecastmonth.h"
 
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long;pack_long
-   IMPLEMENTS = init;dump
-   MEMBERS=const char* verification_yearmonth
-   MEMBERS=const char* base_date
-   MEMBERS=const char* day
-   MEMBERS=const char* hour
-   MEMBERS=const char* fcmonth
-   MEMBERS=const char* check
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_g1forecastmonth
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in g1forecastmonth */
-    const char* verification_yearmonth;
-    const char* base_date;
-    const char* day;
-    const char* hour;
-    const char* fcmonth;
-    const char* check;
-} grib_accessor_g1forecastmonth;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_g1forecastmonth = {
-    &grib_accessor_class_long,                      /* super */
-    "g1forecastmonth",                      /* name */
-    sizeof(grib_accessor_g1forecastmonth),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
+grib_accessor_class_g1forecastmonth_t _grib_accessor_class_g1forecastmonth{"g1forecastmonth"};
 grib_accessor_class* grib_accessor_class_g1forecastmonth = &_grib_accessor_class_g1forecastmonth;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_g1forecastmonth* self = (grib_accessor_g1forecastmonth*)a;
+void grib_accessor_class_g1forecastmonth_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_g1forecastmonth_t* self = (grib_accessor_g1forecastmonth_t*)a;
     grib_handle* h = grib_handle_of_accessor(a);
     int n = 0;
     const int count = grib_arguments_get_count(c);
@@ -128,13 +31,11 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
     }
 }
 
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
+void grib_accessor_class_g1forecastmonth_t::dump(grib_accessor* a, grib_dumper* dumper){
     grib_dump_long(dumper, a, NULL);
 }
 
-static int calculate_fcmonth(grib_accessor* a, long verification_yearmonth, long base_date, long day, long hour, long* result)
-{
+int calculate_fcmonth(grib_accessor* a, long verification_yearmonth, long base_date, long day, long hour, long* result){
     long base_yearmonth = 0;
     long vyear  = 0;
     long vmonth = 0;
@@ -157,8 +58,7 @@ static int calculate_fcmonth(grib_accessor* a, long verification_yearmonth, long
     return GRIB_SUCCESS;
 }
 
-static int unpack_long_edition2(grib_accessor* a, long* val, size_t* len)
-{
+int unpack_long_edition2(grib_accessor* a, long* val, size_t* len){
     int err = 0;
     grib_handle* h = grib_handle_of_accessor(a);
     long dataDate, verification_yearmonth;
@@ -202,10 +102,9 @@ static int unpack_long_edition2(grib_accessor* a, long* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int unpack_long_edition1(grib_accessor* a, long* val, size_t* len)
-{
+int unpack_long_edition1(grib_accessor* a, long* val, size_t* len){
     int err = 0;
-    grib_accessor_g1forecastmonth* self = (grib_accessor_g1forecastmonth*)a;
+    grib_accessor_g1forecastmonth_t* self = (grib_accessor_g1forecastmonth_t*)a;
 
     long verification_yearmonth = 0;
     long base_date              = 0;
@@ -249,8 +148,7 @@ static int unpack_long_edition1(grib_accessor* a, long* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
+int grib_accessor_class_g1forecastmonth_t::unpack_long(grib_accessor* a, long* val, size_t* len){
     int err = 0;
     grib_handle* hand = grib_handle_of_accessor(a);
     long edition = 0;
@@ -267,8 +165,7 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
 }
 
 /* TODO: Check for a valid date */
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_g1forecastmonth* self = (grib_accessor_g1forecastmonth*)a;
+int grib_accessor_class_g1forecastmonth_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_g1forecastmonth_t* self = (grib_accessor_g1forecastmonth_t*)a;
     return grib_set_long_internal(grib_handle_of_accessor(a), self->fcmonth, *val);
 }
diff --git a/src/accessor/grib_accessor_class_g1forecastmonth.h b/src/accessor/grib_accessor_class_g1forecastmonth.h
new file mode 100644
index 000000000..6d2b9ee63
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g1forecastmonth.h
@@ -0,0 +1,40 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g1forecastmonth_h
+#define eccodes_accessor_g1forecastmonth_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_g1forecastmonth_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in g1forecastmonth */
+    const char* verification_yearmonth;
+    const char* base_date;
+    const char* day;
+    const char* hour;
+    const char* fcmonth;
+    const char* check;
+};
+
+class grib_accessor_class_g1forecastmonth_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_g1forecastmonth_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g1forecastmonth_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_g1forecastmonth_h */
diff --git a/src/accessor/grib_accessor_class_g1monthlydate.cc b/src/accessor/grib_accessor_class_g1monthlydate.cc
new file mode 100644
index 000000000..3a184669b
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g1monthlydate.cc
@@ -0,0 +1,41 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_g1monthlydate.h"
+
+grib_accessor_class_g1monthlydate_t _grib_accessor_class_g1monthlydate{"g1monthlydate"};
+grib_accessor_class* grib_accessor_class_g1monthlydate = &_grib_accessor_class_g1monthlydate;
+
+
+void grib_accessor_class_g1monthlydate_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_g1monthlydate_t* self = (grib_accessor_g1monthlydate_t*)a;
+    int n                             = 0;
+
+    self->date = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+}
+
+int grib_accessor_class_g1monthlydate_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_g1monthlydate_t* self = (grib_accessor_g1monthlydate_t*)a;
+
+    long date = 0;
+
+    grib_get_long_internal(grib_handle_of_accessor(a), self->date, &date);
+
+    date /= 100;
+    date *= 100;
+    date += 1;
+
+    *val = date;
+
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_g1monthlydate.h b/src/accessor/grib_accessor_class_g1monthlydate.h
new file mode 100644
index 000000000..8efa9cf16
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g1monthlydate.h
@@ -0,0 +1,33 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g1monthlydate_h
+#define eccodes_accessor_g1monthlydate_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_g1monthlydate_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in g1monthlydate */
+    const char* date;
+};
+
+class grib_accessor_class_g1monthlydate_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_g1monthlydate_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g1monthlydate_t{}; }
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_g1monthlydate_h */
diff --git a/src/accessor/grib_accessor_class_g1number_of_coded_values_sh_complex.cc b/src/accessor/grib_accessor_class_g1number_of_coded_values_sh_complex.cc
new file mode 100644
index 000000000..17d36f908
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g1number_of_coded_values_sh_complex.cc
@@ -0,0 +1,81 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_g1number_of_coded_values_sh_complex.h"
+
+grib_accessor_class_g1number_of_coded_values_sh_complex_t _grib_accessor_class_g1number_of_coded_values_sh_complex{"g1number_of_coded_values_sh_complex"};
+grib_accessor_class* grib_accessor_class_g1number_of_coded_values_sh_complex = &_grib_accessor_class_g1number_of_coded_values_sh_complex;
+
+
+void grib_accessor_class_g1number_of_coded_values_sh_complex_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    int n                                                   = 0;
+    grib_accessor_g1number_of_coded_values_sh_complex_t* self = (grib_accessor_g1number_of_coded_values_sh_complex_t*)a;
+    self->bitsPerValue                                      = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->offsetBeforeData                                  = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->offsetAfterData                                   = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->unusedBits                                        = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->numberOfValues                                    = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->JS                                                = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->KS                                                = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->MS                                                = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
+    a->length = 0;
+}
+
+int grib_accessor_class_g1number_of_coded_values_sh_complex_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    int ret               = GRIB_SUCCESS;
+    long bpv              = 0;
+    long offsetBeforeData = 0, offsetAfterData = 0, unusedBits = 0, numberOfValues;
+    long JS = 0, KS = 0, MS = 0, NS = 0;
+
+    grib_accessor_g1number_of_coded_values_sh_complex_t* self = (grib_accessor_g1number_of_coded_values_sh_complex_t*)a;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->bitsPerValue, &bpv)) != GRIB_SUCCESS)
+        return ret;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->offsetBeforeData, &offsetBeforeData)) != GRIB_SUCCESS)
+        return ret;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->offsetAfterData, &offsetAfterData)) != GRIB_SUCCESS)
+        return ret;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->unusedBits, &unusedBits)) != GRIB_SUCCESS)
+        return ret;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->JS, &JS)) != GRIB_SUCCESS)
+        return ret;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->KS, &KS)) != GRIB_SUCCESS)
+        return ret;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->MS, &MS)) != GRIB_SUCCESS)
+        return ret;
+
+    if (JS != KS || KS != MS)
+        return GRIB_NOT_IMPLEMENTED;
+
+    NS = (MS + 1) * (MS + 2);
+
+    if (bpv != 0) {
+        DEBUG_ASSERT(offsetAfterData > offsetBeforeData);
+        *val = ((offsetAfterData - offsetBeforeData) * 8 - unusedBits + NS * (bpv - 32)) / bpv;
+    }
+    else {
+        if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->numberOfValues, &numberOfValues)) != GRIB_SUCCESS)
+            return ret;
+
+        *val = numberOfValues;
+    }
+
+    return ret;
+}
diff --git a/src/accessor/grib_accessor_class_g1number_of_coded_values_sh_complex.h b/src/accessor/grib_accessor_class_g1number_of_coded_values_sh_complex.h
new file mode 100644
index 000000000..764bfa04d
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g1number_of_coded_values_sh_complex.h
@@ -0,0 +1,40 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g1number_of_coded_values_sh_complex_h
+#define eccodes_accessor_g1number_of_coded_values_sh_complex_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_g1number_of_coded_values_sh_complex_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in g1number_of_coded_values_sh_complex */
+    const char* numberOfValues;
+    const char* bitsPerValue;
+    const char* offsetBeforeData;
+    const char* offsetAfterData;
+    const char* unusedBits;
+    const char* JS;
+    const char* KS;
+    const char* MS;
+};
+
+class grib_accessor_class_g1number_of_coded_values_sh_complex_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_g1number_of_coded_values_sh_complex_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g1number_of_coded_values_sh_complex_t{}; }
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_g1number_of_coded_values_sh_complex_h */
diff --git a/src/accessor/grib_accessor_class_g1number_of_coded_values_sh_simple.cc b/src/accessor/grib_accessor_class_g1number_of_coded_values_sh_simple.cc
new file mode 100644
index 000000000..c2d9801f8
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g1number_of_coded_values_sh_simple.cc
@@ -0,0 +1,62 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_g1number_of_coded_values_sh_simple.h"
+
+grib_accessor_class_g1number_of_coded_values_sh_simple_t _grib_accessor_class_g1number_of_coded_values_sh_simple{"g1number_of_coded_values_sh_simple"};
+grib_accessor_class* grib_accessor_class_g1number_of_coded_values_sh_simple = &_grib_accessor_class_g1number_of_coded_values_sh_simple;
+
+
+void grib_accessor_class_g1number_of_coded_values_sh_simple_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    int n                                                  = 0;
+    grib_accessor_g1number_of_coded_values_sh_simple_t* self = (grib_accessor_g1number_of_coded_values_sh_simple_t*)a;
+    self->bitsPerValue                                     = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->offsetBeforeData                                 = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->offsetAfterData                                  = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->unusedBits                                       = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->numberOfValues                                   = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
+    a->length = 0;
+}
+
+int grib_accessor_class_g1number_of_coded_values_sh_simple_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    int ret               = GRIB_SUCCESS;
+    long bpv              = 0;
+    long offsetBeforeData = 0, offsetAfterData = 0, unusedBits = 0, numberOfValues;
+
+    grib_accessor_g1number_of_coded_values_sh_simple_t* self = (grib_accessor_g1number_of_coded_values_sh_simple_t*)a;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->bitsPerValue, &bpv)) != GRIB_SUCCESS)
+        return ret;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->offsetBeforeData, &offsetBeforeData)) != GRIB_SUCCESS)
+        return ret;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->offsetAfterData, &offsetAfterData)) != GRIB_SUCCESS)
+        return ret;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->unusedBits, &unusedBits)) != GRIB_SUCCESS)
+        return ret;
+
+    if (bpv != 0) {
+        DEBUG_ASSERT(offsetAfterData > offsetBeforeData);
+        *val = ((offsetAfterData - offsetBeforeData) * 8 - unusedBits) / bpv;
+    }
+    else {
+        if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->numberOfValues, &numberOfValues)) != GRIB_SUCCESS)
+            return ret;
+
+        *val = numberOfValues;
+    }
+    return ret;
+}
diff --git a/src/accessor/grib_accessor_class_g1number_of_coded_values_sh_simple.h b/src/accessor/grib_accessor_class_g1number_of_coded_values_sh_simple.h
new file mode 100644
index 000000000..fb5ab298d
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g1number_of_coded_values_sh_simple.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g1number_of_coded_values_sh_simple_h
+#define eccodes_accessor_g1number_of_coded_values_sh_simple_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_g1number_of_coded_values_sh_simple_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in g1number_of_coded_values_sh_simple */
+    const char* numberOfValues;
+    const char* bitsPerValue;
+    const char* offsetBeforeData;
+    const char* offsetAfterData;
+    const char* unusedBits;
+};
+
+class grib_accessor_class_g1number_of_coded_values_sh_simple_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_g1number_of_coded_values_sh_simple_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g1number_of_coded_values_sh_simple_t{}; }
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_g1number_of_coded_values_sh_simple_h */
diff --git a/src/accessor/todo/grib_accessor_class_g1step_range.cc b/src/accessor/grib_accessor_class_g1step_range.cc
similarity index 79%
rename from src/accessor/todo/grib_accessor_class_g1step_range.cc
rename to src/accessor/grib_accessor_class_g1step_range.cc
index 46c7a3cc8..f2444486a 100644
--- a/src/accessor/todo/grib_accessor_class_g1step_range.cc
+++ b/src/accessor/grib_accessor_class_g1step_range.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,131 +9,15 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-/*********************************************
- *   Enrico Fucile
- *******************************************/
-
 #include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_abstract_long_vector
-   IMPLEMENTS = pack_string;unpack_string;value_count
-   IMPLEMENTS = pack_long;unpack_long;dump
-   IMPLEMENTS = get_native_type;string_length
-   IMPLEMENTS = init; destroy
-   MEMBERS    = const char* p1
-   MEMBERS    = const char* p2
-   MEMBERS    = const char* timeRangeIndicator
-   MEMBERS    = const char *unit
-   MEMBERS    = const char *step_unit
-   MEMBERS    = const char *stepType
-   MEMBERS    = const char *patch_fp_precip
-   MEMBERS    = int error_on_units
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int pack_string(grib_accessor*, const char*, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static size_t string_length(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-static void destroy(grib_context*, grib_accessor*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_g1step_range
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in abstract_long_vector */
-    long* v;
-    long pack_index;
-    int number_of_elements;
-    /* Members defined in g1step_range */
-    const char* p1;
-    const char* p2;
-    const char* timeRangeIndicator;
-    const char *unit;
-    const char *step_unit;
-    const char *stepType;
-    const char *patch_fp_precip;
-    int error_on_units;
-} grib_accessor_g1step_range;
-
-extern grib_accessor_class* grib_accessor_class_abstract_long_vector;
-
-static grib_accessor_class _grib_accessor_class_g1step_range = {
-    &grib_accessor_class_abstract_long_vector,                      /* super */
-    "g1step_range",                      /* name */
-    sizeof(grib_accessor_g1step_range),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    &destroy,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    &string_length,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    &pack_string,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_g1step_range.h"
 
+grib_accessor_class_g1step_range_t _grib_accessor_class_g1step_range{"g1step_range"};
 grib_accessor_class* grib_accessor_class_g1step_range = &_grib_accessor_class_g1step_range;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_g1step_range* self = (grib_accessor_g1step_range*)a;
+void grib_accessor_class_g1step_range_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_g1step_range_t* self = (grib_accessor_g1step_range_t*)a;
     grib_handle* h                   = grib_handle_of_accessor(a);
     int n                            = 0;
     self->p1                         = grib_arguments_get_name(h, c, n++);
@@ -153,8 +38,7 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
     a->length = 0;
 }
 
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
+void grib_accessor_class_g1step_range_t::dump(grib_accessor* a, grib_dumper* dumper){
     grib_dump_string(dumper, a, NULL);
 }
 
@@ -203,7 +87,7 @@ static const int u2s[] = {
 
 int grib_g1_step_get_steps(grib_accessor* a, long* start, long* theEnd)
 {
-    grib_accessor_g1step_range* self = (grib_accessor_g1step_range*)a;
+    grib_accessor_g1step_range_t* self = (grib_accessor_g1step_range_t*)a;
     int err                          = 0;
     long p1 = 0, p2 = 0, unit = 0, timeRangeIndicator = 0, timeRangeIndicatorFromStepRange = 0;
     long step_unit    = 1;
@@ -298,9 +182,8 @@ int grib_g1_step_get_steps(grib_accessor* a, long* start, long* theEnd)
     return 0;
 }
 
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    grib_accessor_g1step_range* self = (grib_accessor_g1step_range*)a;
+int grib_accessor_class_g1step_range_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    grib_accessor_g1step_range_t* self = (grib_accessor_g1step_range_t*)a;
     char buf[100];
     size_t size = 0;
     long start = 0, theEnd = 0;
@@ -450,9 +333,8 @@ static int grib_g1_step_apply_units(
     return GRIB_WRONG_STEP;
 }
 
-static int pack_string(grib_accessor* a, const char* val, size_t* len)
-{
-    grib_accessor_g1step_range* self = (grib_accessor_g1step_range*)a;
+int grib_accessor_class_g1step_range_t::pack_string(grib_accessor* a, const char* val, size_t* len){
+    grib_accessor_g1step_range_t* self = (grib_accessor_g1step_range_t*)a;
     grib_handle* h                   = grib_handle_of_accessor(a);
     long timeRangeIndicator = 0, P1 = 0, P2 = 0;
     long start = 0, theEnd = -1, unit = 0, ounit = 0, step_unit = 1;
@@ -631,25 +513,22 @@ static int pack_string(grib_accessor* a, const char* val, size_t* len)
     return 0;
 }
 
-static int value_count(grib_accessor* a, long* count)
-{
+int grib_accessor_class_g1step_range_t::value_count(grib_accessor* a, long* count){
     *count = 1;
     return 0;
 }
 
-static size_t string_length(grib_accessor* a)
-{
+size_t grib_accessor_class_g1step_range_t::string_length(grib_accessor* a){
     return 255;
 }
 
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
+int grib_accessor_class_g1step_range_t::pack_long(grib_accessor* a, const long* val, size_t* len){
     char buff[256];
     size_t bufflen                   = 100;
     char sval[100]                   = { 0 };
     char* p                          = sval;
     size_t svallen                   = 100;
-    grib_accessor_g1step_range* self = (grib_accessor_g1step_range*)a;
+    grib_accessor_g1step_range_t* self = (grib_accessor_g1step_range_t*)a;
     char stepType[20]                = {0,};
     size_t stepTypeLen = 20;
     long step_unit     = 0;
@@ -718,9 +597,8 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
     return GRIB_INTERNAL_ERROR;
 }
 
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_g1step_range* self = (grib_accessor_g1step_range*)a;
+int grib_accessor_class_g1step_range_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_g1step_range_t* self = (grib_accessor_g1step_range_t*)a;
     char buff[100];
     size_t bufflen = 100;
     long start, theEnd;
@@ -749,13 +627,11 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
     return 0;
 }
 
-static int get_native_type(grib_accessor* a)
-{
+int grib_accessor_class_g1step_range_t::get_native_type(grib_accessor* a){
     return GRIB_TYPE_STRING;
 }
 
-static void destroy(grib_context* c, grib_accessor* a)
-{
-    grib_accessor_g1step_range* self = (grib_accessor_g1step_range*)a;
+void grib_accessor_class_g1step_range_t::destroy(grib_context* c, grib_accessor* a){
+    grib_accessor_g1step_range_t* self = (grib_accessor_g1step_range_t*)a;
     grib_context_free(c, self->v);
 }
diff --git a/src/accessor/grib_accessor_class_g1step_range.h b/src/accessor/grib_accessor_class_g1step_range.h
new file mode 100644
index 000000000..c9c3dd911
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g1step_range.h
@@ -0,0 +1,48 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g1step_range_h
+#define eccodes_accessor_g1step_range_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_abstract_long_vector.h"
+
+class grib_accessor_g1step_range_t : public grib_accessor_abstract_long_vector_t
+{
+public:
+    /* Members defined in g1step_range */
+    const char* p1;
+    const char* p2;
+    const char* timeRangeIndicator;
+    const char *unit;
+    const char *step_unit;
+    const char *stepType;
+    const char *patch_fp_precip;
+    int error_on_units;
+};
+
+class grib_accessor_class_g1step_range_t : public grib_accessor_class_abstract_long_vector_t
+{
+public:
+    grib_accessor_class_g1step_range_t(const char* name) : grib_accessor_class_abstract_long_vector_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g1step_range_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int pack_string(grib_accessor*, const char*, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    size_t string_length(grib_accessor*) override;
+    int value_count(grib_accessor*, long*) override;
+    void destroy(grib_context*, grib_accessor*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_g1step_range_h */
diff --git a/src/accessor/grib_accessor_class_g1verificationdate.cc b/src/accessor/grib_accessor_class_g1verificationdate.cc
new file mode 100644
index 000000000..7f91c5b99
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g1verificationdate.cc
@@ -0,0 +1,64 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_g1verificationdate.h"
+
+grib_accessor_class_g1verificationdate_t _grib_accessor_class_g1verificationdate{"g1verificationdate"};
+grib_accessor_class* grib_accessor_class_g1verificationdate = &_grib_accessor_class_g1verificationdate;
+
+
+void grib_accessor_class_g1verificationdate_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_g1verificationdate_t* self = (grib_accessor_g1verificationdate_t*)a;
+    int n                                  = 0;
+
+    self->date = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->time = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->step = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+}
+
+int grib_accessor_class_g1verificationdate_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_g1verificationdate_t* self = (grib_accessor_g1verificationdate_t*)a;
+    int ret                                = 0;
+    long date                              = 0;
+    long time                              = 0;
+    long cdate                             = 0;
+    long step                              = 0;
+    long vtime                             = 0;
+    long vdate                             = 0;
+    long vd                                = 0;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->date, &date)) != GRIB_SUCCESS)
+        return ret;
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->time, &time)) != GRIB_SUCCESS)
+        return ret;
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->step, &step)) != GRIB_SUCCESS)
+        return ret;
+
+    time /= 100;
+
+    cdate = (long)grib_date_to_julian(date);
+    vtime = cdate * 24 + time + step;
+    vd    = vtime / 24;
+    vdate = grib_julian_to_date(vd);
+
+    /* printf("\n********\n date %d, time %d, step %d, vdate: %d, cdate %d, vd %d\n********\n", date, time, step, vdate, cdate, vd);    */
+
+    if (*len < 1)
+        return GRIB_ARRAY_TOO_SMALL;
+
+    *val = vdate;
+
+    /* fprintf(stdout,"\n********\n %d cdate %d vd %d\n********\n", vdate, cdate, step); */
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_g1verificationdate.h b/src/accessor/grib_accessor_class_g1verificationdate.h
new file mode 100644
index 000000000..198801aba
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g1verificationdate.h
@@ -0,0 +1,35 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g1verificationdate_h
+#define eccodes_accessor_g1verificationdate_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_g1verificationdate_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in g1verificationdate */
+    const char* date;
+    const char* time;
+    const char* step;
+};
+
+class grib_accessor_class_g1verificationdate_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_g1verificationdate_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g1verificationdate_t{}; }
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_g1verificationdate_h */
diff --git a/src/accessor/grib_accessor_class_g2_aerosol.cc b/src/accessor/grib_accessor_class_g2_aerosol.cc
new file mode 100644
index 000000000..654c0e97a
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g2_aerosol.cc
@@ -0,0 +1,114 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_g2_aerosol.h"
+
+grib_accessor_class_g2_aerosol_t _grib_accessor_class_g2_aerosol{"g2_aerosol"};
+grib_accessor_class* grib_accessor_class_g2_aerosol = &_grib_accessor_class_g2_aerosol;
+
+
+void grib_accessor_class_g2_aerosol_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_g2_aerosol_t* self = (grib_accessor_g2_aerosol_t*)a;
+    grib_handle* hand              = grib_handle_of_accessor(a);
+    int n                          = 0;
+
+    self->productDefinitionTemplateNumber = grib_arguments_get_name(hand, c, n++);
+    self->stepType                        = grib_arguments_get_name(hand, c, n++);
+    self->optical                         = grib_arguments_get_long(hand, c, n++);
+}
+
+int grib_accessor_class_g2_aerosol_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_g2_aerosol_t* self       = (grib_accessor_g2_aerosol_t*)a;
+    long productDefinitionTemplateNumber = 0;
+    grib_get_long(grib_handle_of_accessor(a), self->productDefinitionTemplateNumber, &productDefinitionTemplateNumber);
+
+    if (self->optical)
+        *val = grib2_is_PDTN_AerosolOptical(productDefinitionTemplateNumber);
+    else
+        *val = grib2_is_PDTN_Aerosol(productDefinitionTemplateNumber);
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_g2_aerosol_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_g2_aerosol_t* self          = (grib_accessor_g2_aerosol_t*)a;
+    grib_handle* hand                       = grib_handle_of_accessor(a);
+    long productDefinitionTemplateNumber    = -1;
+    long productDefinitionTemplateNumberNew = -1;
+    /*long type=-1;
+    long stream=-1;*/
+    long eps          = -1;
+    char stepType[15] = {0,};
+    size_t slen = 15;
+    /*int aerosol = *val;*/
+    int isInstant = 0;
+    /*long derivedForecast=-1;*/
+    int ret = 0;
+
+    if (grib_get_long(hand, self->productDefinitionTemplateNumber, &productDefinitionTemplateNumber) != GRIB_SUCCESS)
+        return GRIB_SUCCESS;
+
+    /*
+     grib_get_long(hand, self->type,&type);
+     grib_get_long(hand, self->stream,&stream);
+     */
+    ret = grib_get_string(hand, self->stepType, stepType, &slen);
+    Assert(ret == GRIB_SUCCESS);
+
+    //eps = grib2_is_PDTN_EPS(productDefinitionTemplateNumber);
+    eps = grib_is_defined(hand, "perturbationNumber");
+
+    if (!strcmp(stepType, "instant"))
+        isInstant = 1;
+
+    if (eps == 1) {
+        if (isInstant) {
+            productDefinitionTemplateNumberNew = 45;
+        }
+        else {
+            /*productDefinitionTemplateNumberNew = 47; PDT deprecated*/
+            productDefinitionTemplateNumberNew = 85;
+        }
+    }
+    else {
+        if (isInstant) {
+            productDefinitionTemplateNumberNew = 48; /*44 is deprecated*/
+        }
+        else {
+            productDefinitionTemplateNumberNew = 46;
+        }
+    }
+
+    if (self->optical) {
+        /* Note: There is no interval based template for optical properties of aerosol! */
+        if (eps)
+            productDefinitionTemplateNumberNew = 49;
+        else
+            productDefinitionTemplateNumberNew = 48;
+        if (!isInstant) {
+            grib_context_log(hand->context, GRIB_LOG_ERROR,
+                             "The product definition templates for optical properties of aerosol are for a point-in-time only");
+        }
+    }
+
+    if (productDefinitionTemplateNumber != productDefinitionTemplateNumberNew) {
+        grib_set_long(hand, self->productDefinitionTemplateNumber, productDefinitionTemplateNumberNew);
+        /*if (derivedForecast>=0) grib_set_long(hand, self->derivedForecast,derivedForecast);*/
+    }
+
+    return 0;
+}
+
+int grib_accessor_class_g2_aerosol_t::value_count(grib_accessor* a, long* count){
+    *count = 1;
+    return 0;
+}
diff --git a/src/accessor/grib_accessor_class_g2_aerosol.h b/src/accessor/grib_accessor_class_g2_aerosol.h
new file mode 100644
index 000000000..fb29a9561
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g2_aerosol.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g2_aerosol_h
+#define eccodes_accessor_g2_aerosol_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_unsigned.h"
+
+class grib_accessor_g2_aerosol_t : public grib_accessor_unsigned_t
+{
+public:
+    /* Members defined in g2_aerosol */
+    const char* productDefinitionTemplateNumber;
+    const char* stepType;
+    int optical;
+};
+
+class grib_accessor_class_g2_aerosol_t : public grib_accessor_class_unsigned_t
+{
+public:
+    grib_accessor_class_g2_aerosol_t(const char* name) : grib_accessor_class_unsigned_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g2_aerosol_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_g2_aerosol_h */
diff --git a/src/accessor/todo/grib_accessor_class_g2_chemical.cc b/src/accessor/grib_accessor_class_g2_chemical.cc
similarity index 54%
rename from src/accessor/todo/grib_accessor_class_g2_chemical.cc
rename to src/accessor/grib_accessor_class_g2_chemical.cc
index 16d8e6f33..72d7581e1 100644
--- a/src/accessor/todo/grib_accessor_class_g2_chemical.cc
+++ b/src/accessor/grib_accessor_class_g2_chemical.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,108 +10,14 @@
  */
 
 #include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_unsigned
-   IMPLEMENTS = unpack_long;pack_long; value_count
-   IMPLEMENTS = init
-   MEMBERS=const char* productDefinitionTemplateNumber
-   MEMBERS=const char* stepType
-   MEMBERS=int chemical_type
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_g2_chemical
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in unsigned */
-    long nbytes;
-    grib_arguments* arg;
-    /* Members defined in g2_chemical */
-    const char* productDefinitionTemplateNumber;
-    const char* stepType;
-    int chemical_type;
-} grib_accessor_g2_chemical;
-
-extern grib_accessor_class* grib_accessor_class_unsigned;
-
-static grib_accessor_class _grib_accessor_class_g2_chemical = {
-    &grib_accessor_class_unsigned,                      /* super */
-    "g2_chemical",                      /* name */
-    sizeof(grib_accessor_g2_chemical),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_g2_chemical.h"
 
+grib_accessor_class_g2_chemical_t _grib_accessor_class_g2_chemical{"g2_chemical"};
 grib_accessor_class* grib_accessor_class_g2_chemical = &_grib_accessor_class_g2_chemical;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_g2_chemical* self = (grib_accessor_g2_chemical*)a;
+void grib_accessor_class_g2_chemical_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_g2_chemical_t* self = (grib_accessor_g2_chemical_t*)a;
     grib_handle* hand               = grib_handle_of_accessor(a);
     int n                           = 0;
 
@@ -119,9 +26,8 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
     self->chemical_type                    = grib_arguments_get_long(hand, c, n++);
 }
 
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_g2_chemical* self      = (grib_accessor_g2_chemical*)a;
+int grib_accessor_class_g2_chemical_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_g2_chemical_t* self      = (grib_accessor_g2_chemical_t*)a;
     long productDefinitionTemplateNumber = 0;
     grib_get_long(grib_handle_of_accessor(a), self->productDefinitionTemplateNumber, &productDefinitionTemplateNumber);
 
@@ -141,9 +47,8 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_g2_chemical* self         = (grib_accessor_g2_chemical*)a;
+int grib_accessor_class_g2_chemical_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_g2_chemical_t* self         = (grib_accessor_g2_chemical_t*)a;
     grib_handle* hand                       = grib_handle_of_accessor(a);
     long productDefinitionTemplateNumber    = -1;
     long productDefinitionTemplateNumberNew = -1;
@@ -214,8 +119,7 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
     return 0;
 }
 
-static int value_count(grib_accessor* a, long* count)
-{
+int grib_accessor_class_g2_chemical_t::value_count(grib_accessor* a, long* count){
     *count = 1;
     return 0;
 }
diff --git a/src/accessor/grib_accessor_class_g2_chemical.h b/src/accessor/grib_accessor_class_g2_chemical.h
new file mode 100644
index 000000000..9cfe4f8bc
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g2_chemical.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g2_chemical_h
+#define eccodes_accessor_g2_chemical_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_unsigned.h"
+
+class grib_accessor_g2_chemical_t : public grib_accessor_unsigned_t
+{
+public:
+    /* Members defined in g2_chemical */
+    const char* productDefinitionTemplateNumber;
+    const char* stepType;
+    int chemical_type;
+};
+
+class grib_accessor_class_g2_chemical_t : public grib_accessor_class_unsigned_t
+{
+public:
+    grib_accessor_class_g2_chemical_t(const char* name) : grib_accessor_class_unsigned_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g2_chemical_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_g2_chemical_h */
diff --git a/src/accessor/todo/grib_accessor_class_g2_eps.cc b/src/accessor/grib_accessor_class_g2_eps.cc
similarity index 58%
rename from src/accessor/todo/grib_accessor_class_g2_eps.cc
rename to src/accessor/grib_accessor_class_g2_eps.cc
index fc202a572..336245721 100644
--- a/src/accessor/todo/grib_accessor_class_g2_eps.cc
+++ b/src/accessor/grib_accessor_class_g2_eps.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,113 +10,14 @@
  */
 
 #include "grib_api_internal.h"
+#include "grib_accessor_class_g2_eps.h"
 
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_unsigned
-   IMPLEMENTS = unpack_long;pack_long; value_count
-   IMPLEMENTS = init
-   MEMBERS=const char* productDefinitionTemplateNumber
-   MEMBERS=const char* stream
-   MEMBERS=const char* type
-   MEMBERS=const char* stepType
-   MEMBERS=const char* derivedForecast
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_g2_eps
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in unsigned */
-    long nbytes;
-    grib_arguments* arg;
-    /* Members defined in g2_eps */
-    const char* productDefinitionTemplateNumber;
-    const char* stream;
-    const char* type;
-    const char* stepType;
-    const char* derivedForecast;
-} grib_accessor_g2_eps;
-
-extern grib_accessor_class* grib_accessor_class_unsigned;
-
-static grib_accessor_class _grib_accessor_class_g2_eps = {
-    &grib_accessor_class_unsigned,                      /* super */
-    "g2_eps",                      /* name */
-    sizeof(grib_accessor_g2_eps),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
+grib_accessor_class_g2_eps_t _grib_accessor_class_g2_eps{"g2_eps"};
 grib_accessor_class* grib_accessor_class_g2_eps = &_grib_accessor_class_g2_eps;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_g2_eps* self = (grib_accessor_g2_eps*)a;
+void grib_accessor_class_g2_eps_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_g2_eps_t* self = (grib_accessor_g2_eps_t*)a;
     int n                      = 0;
 
     self->productDefinitionTemplateNumber = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
@@ -125,9 +27,8 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
     self->derivedForecast                 = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
 }
 
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_g2_eps* self           = (grib_accessor_g2_eps*)a;
+int grib_accessor_class_g2_eps_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_g2_eps_t* self           = (grib_accessor_g2_eps_t*)a;
     long productDefinitionTemplateNumber = 0;
     int err = 0;
     grib_handle* hand = grib_handle_of_accessor(a);
@@ -145,9 +46,8 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_g2_eps* self              = (grib_accessor_g2_eps*)a;
+int grib_accessor_class_g2_eps_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_g2_eps_t* self              = (grib_accessor_g2_eps_t*)a;
     grib_handle* hand                       = grib_handle_of_accessor(a);
     long productDefinitionTemplateNumber    = -1;
     long productDefinitionTemplateNumberNew = -1;
@@ -266,8 +166,7 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
     return 0;
 }
 
-static int value_count(grib_accessor* a, long* count)
-{
+int grib_accessor_class_g2_eps_t::value_count(grib_accessor* a, long* count){
     *count = 1;
     return 0;
 }
diff --git a/src/accessor/grib_accessor_class_g2_eps.h b/src/accessor/grib_accessor_class_g2_eps.h
new file mode 100644
index 000000000..7c39dd580
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g2_eps.h
@@ -0,0 +1,39 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g2_eps_h
+#define eccodes_accessor_g2_eps_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_unsigned.h"
+
+class grib_accessor_g2_eps_t : public grib_accessor_unsigned_t
+{
+public:
+    /* Members defined in g2_eps */
+    const char* productDefinitionTemplateNumber;
+    const char* stream;
+    const char* type;
+    const char* stepType;
+    const char* derivedForecast;
+};
+
+class grib_accessor_class_g2_eps_t : public grib_accessor_class_unsigned_t
+{
+public:
+    grib_accessor_class_g2_eps_t(const char* name) : grib_accessor_class_unsigned_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g2_eps_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_g2_eps_h */
diff --git a/src/accessor/todo/grib_accessor_class_g2_mars_labeling.cc b/src/accessor/grib_accessor_class_g2_mars_labeling.cc
similarity index 75%
rename from src/accessor/todo/grib_accessor_class_g2_mars_labeling.cc
rename to src/accessor/grib_accessor_class_g2_mars_labeling.cc
index ad0647e30..4de889cfa 100644
--- a/src/accessor/todo/grib_accessor_class_g2_mars_labeling.cc
+++ b/src/accessor/grib_accessor_class_g2_mars_labeling.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,129 +9,15 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-/**************************************
- *  Enrico Fucile
- **************************************/
-
-
 #include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = unpack_long;pack_long; value_count
-   IMPLEMENTS = unpack_string;pack_string
-   IMPLEMENTS = init; get_native_type
-   MEMBERS=int index
-   MEMBERS=const char* the_class
-   MEMBERS=const char* stream
-   MEMBERS=const char* type
-   MEMBERS=const char* expver
-   MEMBERS=const char* typeOfProcessedData
-   MEMBERS=const char* productDefinitionTemplateNumber
-   MEMBERS=const char* stepType
-   MEMBERS=const char* derivedForecast
-   MEMBERS=const char* typeOfGeneratingProcess
-
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int pack_string(grib_accessor*, const char*, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_g2_mars_labeling
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in g2_mars_labeling */
-    int index;
-    const char* the_class;
-    const char* stream;
-    const char* type;
-    const char* expver;
-    const char* typeOfProcessedData;
-    const char* productDefinitionTemplateNumber;
-    const char* stepType;
-    const char* derivedForecast;
-    const char* typeOfGeneratingProcess;
-} grib_accessor_g2_mars_labeling;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_g2_mars_labeling = {
-    &grib_accessor_class_gen,                      /* super */
-    "g2_mars_labeling",                      /* name */
-    sizeof(grib_accessor_g2_mars_labeling),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    &pack_string,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_g2_mars_labeling.h"
 
+grib_accessor_class_g2_mars_labeling_t _grib_accessor_class_g2_mars_labeling{"g2_mars_labeling"};
 grib_accessor_class* grib_accessor_class_g2_mars_labeling = &_grib_accessor_class_g2_mars_labeling;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_g2_mars_labeling* self = (grib_accessor_g2_mars_labeling*)a;
+void grib_accessor_class_g2_mars_labeling_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_g2_mars_labeling_t* self = (grib_accessor_g2_mars_labeling_t*)a;
     int n                                = 0;
     grib_handle* hand                    = grib_handle_of_accessor(a);
 
@@ -146,9 +33,8 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
     self->typeOfGeneratingProcess         = grib_arguments_get_name(hand, c, n++);
 }
 
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_g2_mars_labeling* self = (grib_accessor_g2_mars_labeling*)a;
+int grib_accessor_class_g2_mars_labeling_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_g2_mars_labeling_t* self = (grib_accessor_g2_mars_labeling_t*)a;
     char* key                            = NULL;
 
     switch (self->index) {
@@ -170,9 +56,8 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
     return grib_get_long(grib_handle_of_accessor(a), key, val);
 }
 
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    grib_accessor_g2_mars_labeling* self = (grib_accessor_g2_mars_labeling*)a;
+int grib_accessor_class_g2_mars_labeling_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    grib_accessor_g2_mars_labeling_t* self = (grib_accessor_g2_mars_labeling_t*)a;
     char* key                            = NULL;
 
     switch (self->index) {
@@ -194,10 +79,9 @@ static int unpack_string(grib_accessor* a, char* val, size_t* len)
     return grib_get_string(grib_handle_of_accessor(a), key, val, len);
 }
 
-static int extra_set(grib_accessor* a, long val)
-{
+int extra_set(grib_accessor* a, long val){
     int ret                              = 0;
-    grib_accessor_g2_mars_labeling* self = (grib_accessor_g2_mars_labeling*)a;
+    grib_accessor_g2_mars_labeling_t* self = (grib_accessor_g2_mars_labeling_t*)a;
     grib_handle* hand                    = grib_handle_of_accessor(a);
     char stepType[30]                    = {0,};
     size_t stepTypelen                      = 30;
@@ -417,9 +301,8 @@ static int extra_set(grib_accessor* a, long val)
     return ret;
 }
 
-static int pack_string(grib_accessor* a, const char* val, size_t* len)
-{
-    grib_accessor_g2_mars_labeling* self = (grib_accessor_g2_mars_labeling*)a;
+int grib_accessor_class_g2_mars_labeling_t::pack_string(grib_accessor* a, const char* val, size_t* len){
+    grib_accessor_g2_mars_labeling_t* self = (grib_accessor_g2_mars_labeling_t*)a;
     char* key                            = NULL;
     int ret                              = 0;
     long lval                            = 0;
@@ -451,9 +334,8 @@ static int pack_string(grib_accessor* a, const char* val, size_t* len)
     return extra_set(a, lval);
 }
 
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_g2_mars_labeling* self = (grib_accessor_g2_mars_labeling*)a;
+int grib_accessor_class_g2_mars_labeling_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_g2_mars_labeling_t* self = (grib_accessor_g2_mars_labeling_t*)a;
     char* key                            = NULL;
     int ret                              = 0;
 
@@ -480,15 +362,13 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
     return extra_set(a, *val);
 }
 
-static int value_count(grib_accessor* a, long* count)
-{
+int grib_accessor_class_g2_mars_labeling_t::value_count(grib_accessor* a, long* count){
     *count = 1;
     return 0;
 }
 
-static int get_native_type(grib_accessor* a)
-{
-    grib_accessor_g2_mars_labeling* self = (grib_accessor_g2_mars_labeling*)a;
+int grib_accessor_class_g2_mars_labeling_t::get_native_type(grib_accessor* a){
+    grib_accessor_g2_mars_labeling_t* self = (grib_accessor_g2_mars_labeling_t*)a;
     char* key                            = NULL;
     int ret                              = 0;
     int type                             = 0;
@@ -509,8 +389,7 @@ static int get_native_type(grib_accessor* a)
             return GRIB_INTERNAL_ERROR;
     }
 
-    ret = grib_get_native_type(grib_handle_of_accessor(a), key, &type);
-    if (ret)
+    ret = grib_get_native_type(grib_handle_of_accessor(a), key, &type);    if (ret)
         grib_context_log(a->context, GRIB_LOG_ERROR,
                          "unable to get native type for %s", key);
     return type;
diff --git a/src/accessor/grib_accessor_class_g2_mars_labeling.h b/src/accessor/grib_accessor_class_g2_mars_labeling.h
new file mode 100644
index 000000000..0a678174f
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g2_mars_labeling.h
@@ -0,0 +1,47 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g2_mars_labeling_h
+#define eccodes_accessor_g2_mars_labeling_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_g2_mars_labeling_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in g2_mars_labeling */
+    int index;
+    const char* the_class;
+    const char* stream;
+    const char* type;
+    const char* expver;
+    const char* typeOfProcessedData;
+    const char* productDefinitionTemplateNumber;
+    const char* stepType;
+    const char* derivedForecast;
+    const char* typeOfGeneratingProcess;
+};
+
+class grib_accessor_class_g2_mars_labeling_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_g2_mars_labeling_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g2_mars_labeling_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int pack_string(grib_accessor*, const char*, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_g2_mars_labeling_h */
diff --git a/src/accessor/grib_accessor_class_g2bitmap.cc b/src/accessor/grib_accessor_class_g2bitmap.cc
new file mode 100644
index 000000000..f6ed3f1c8
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g2bitmap.cc
@@ -0,0 +1,75 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_g2bitmap.h"
+#include "shared_functions.h"
+
+grib_accessor_class_g2bitmap_t _grib_accessor_class_g2bitmap{"g2bitmap"};
+grib_accessor_class* grib_accessor_class_g2bitmap = &_grib_accessor_class_g2bitmap;
+
+
+void grib_accessor_class_g2bitmap_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    grib_accessor_g2bitmap_t* self = (grib_accessor_g2bitmap_t*)a;
+
+    self->numberOfValues = grib_arguments_get_name(grib_handle_of_accessor(a), arg, 4);
+}
+
+int grib_accessor_class_g2bitmap_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_g2bitmap_t* self = (grib_accessor_g2bitmap_t*)a;
+
+    size_t tlen;
+
+    unsigned char* buf = NULL;
+    size_t i;
+    int err            = 0;
+    long pos           = 0;
+    // long bmaplen       = 0;
+    double miss_values = 0;
+    tlen               = (*len + 7) / 8;
+
+    if ((err = grib_get_double_internal(grib_handle_of_accessor(a), self->missing_value, &miss_values)) != GRIB_SUCCESS)
+        return err;
+
+    buf = (unsigned char*)grib_context_malloc_clear(a->context, tlen);
+    if (!buf)
+        return GRIB_OUT_OF_MEMORY;
+    pos = 0;
+    for (i = 0; i < *len; i++) {
+        if (val[i] == miss_values)
+            pos++;
+        else {
+            // bmaplen++;
+            grib_set_bit_on(buf, &pos);
+        }
+    }
+
+    if ((err = grib_set_long_internal(grib_handle_of_accessor(a), self->numberOfValues, *len)) != GRIB_SUCCESS) {
+        grib_context_free(a->context, buf);
+        return err;
+    }
+
+    grib_buffer_replace(a, buf, tlen, 1, 1);
+
+    grib_context_free(a->context, buf);
+
+    return GRIB_SUCCESS;
+}
+
+
+int grib_accessor_class_g2bitmap_t::value_count(grib_accessor* a, long* tlen){
+    grib_accessor_g2bitmap_t* self = (grib_accessor_g2bitmap_t*)a;
+    int err;
+    *tlen = 0;
+
+    err = grib_get_long_internal(grib_handle_of_accessor(a), self->numberOfValues, tlen);
+    return err;
+}
diff --git a/src/accessor/grib_accessor_class_g2bitmap.h b/src/accessor/grib_accessor_class_g2bitmap.h
new file mode 100644
index 000000000..9af7a3b27
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g2bitmap.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g2bitmap_h
+#define eccodes_accessor_g2bitmap_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_bitmap.h"
+
+class grib_accessor_g2bitmap_t : public grib_accessor_bitmap_t
+{
+public:
+    /* Members defined in g2bitmap */
+    const char* numberOfValues;
+};
+
+class grib_accessor_class_g2bitmap_t : public grib_accessor_class_bitmap_t
+{
+public:
+    grib_accessor_class_g2bitmap_t(const char* name) : grib_accessor_class_bitmap_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g2bitmap_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_g2bitmap_h */
diff --git a/src/accessor/grib_accessor_class_g2bitmap_present.cc b/src/accessor/grib_accessor_class_g2bitmap_present.cc
new file mode 100644
index 000000000..b4dfb5cf5
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g2bitmap_present.cc
@@ -0,0 +1,59 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_g2bitmap_present.h"
+
+grib_accessor_class_g2bitmap_present_t _grib_accessor_class_g2bitmap_present{"g2bitmap_present"};
+grib_accessor_class* grib_accessor_class_g2bitmap_present = &_grib_accessor_class_g2bitmap_present;
+
+
+void grib_accessor_class_g2bitmap_present_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    int n                                = 0;
+    grib_accessor_g2bitmap_present_t* self = (grib_accessor_g2bitmap_present_t*)a;
+    self->bitmapIndicator                = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+
+    a->length = 0;
+}
+
+int grib_accessor_class_g2bitmap_present_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    int ret              = GRIB_SUCCESS;
+    long bitmapIndicator = 0;
+
+    grib_accessor_g2bitmap_present_t* self = (grib_accessor_g2bitmap_present_t*)a;
+
+    ret = grib_get_long_internal(grib_handle_of_accessor(a), self->bitmapIndicator, &bitmapIndicator);
+    if (ret) {
+        if (ret == GRIB_NOT_FOUND) {
+            *val = 0;
+            return 0;
+        }
+        else
+            return ret;
+    }
+
+    *val = 1;
+    if (bitmapIndicator == 255)
+        *val = 0;
+
+    *len = 1;
+    return ret;
+}
+
+int grib_accessor_class_g2bitmap_present_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_g2bitmap_present_t* self = (grib_accessor_g2bitmap_present_t*)a;
+    long bitmapIndicator                 = 0;
+
+    if (*val == 0)
+        bitmapIndicator = 255;
+
+    return grib_set_long(grib_handle_of_accessor(a), self->bitmapIndicator, bitmapIndicator);
+}
diff --git a/src/accessor/grib_accessor_class_g2bitmap_present.h b/src/accessor/grib_accessor_class_g2bitmap_present.h
new file mode 100644
index 000000000..7b5cd3f66
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g2bitmap_present.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g2bitmap_present_h
+#define eccodes_accessor_g2bitmap_present_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_g2bitmap_present_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in g2bitmap_present */
+    const char* bitmapIndicator;
+};
+
+class grib_accessor_class_g2bitmap_present_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_g2bitmap_present_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g2bitmap_present_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_g2bitmap_present_h */
diff --git a/src/accessor/grib_accessor_class_g2date.cc b/src/accessor/grib_accessor_class_g2date.cc
new file mode 100644
index 000000000..5b54ccc83
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g2date.cc
@@ -0,0 +1,82 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_g2date.h"
+
+grib_accessor_class_g2date_t _grib_accessor_class_g2date{"g2date"};
+grib_accessor_class* grib_accessor_class_g2date = &_grib_accessor_class_g2date;
+
+void grib_accessor_class_g2date_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_g2date_t* self = (grib_accessor_g2date_t*)a;
+    int n                      = 0;
+
+    self->year  = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->month = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->day   = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+}
+
+int grib_accessor_class_g2date_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    const grib_accessor_g2date_t* self = (grib_accessor_g2date_t*)a;
+
+    int ret = 0;
+    long year  = 0;
+    long month = 0;
+    long day   = 0;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->day, &day)) != GRIB_SUCCESS)
+        return ret;
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->month, &month)) != GRIB_SUCCESS)
+        return ret;
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->year, &year)) != GRIB_SUCCESS)
+        return ret;
+
+    if (*len < 1)
+        return GRIB_WRONG_ARRAY_SIZE;
+
+    val[0] = year * 10000 + month * 100 + day;
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_g2date_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    const grib_accessor_g2date_t* self = (grib_accessor_g2date_t*)a;
+
+    int ret = GRIB_SUCCESS;
+    long v = val[0];
+    long year  = 0;
+    long month = 0;
+    long day   = 0;
+
+    if (*len != 1)
+        return GRIB_WRONG_ARRAY_SIZE;
+
+    year = v / 10000;
+    v %= 10000;
+    month = v / 100;
+    v %= 100;
+    day = v;
+
+    if (!is_date_valid(year, month, day, 0, 0, 0)) {
+        // ECC-1777: For now just a warning. Will later change to an error
+        fprintf(stderr, "ECCODES WARNING :  %s:%s: Date is not valid! year=%ld month=%ld day=%ld\n",
+                a->cclass->name, __func__, year, month, day);
+    }
+
+    if ((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->day, day)) != GRIB_SUCCESS)
+        return ret;
+    if ((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->month, month)) != GRIB_SUCCESS)
+        return ret;
+    if ((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->year, year)) != GRIB_SUCCESS)
+        return ret;
+
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_g2date.h b/src/accessor/grib_accessor_class_g2date.h
new file mode 100644
index 000000000..20276c6fe
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g2date.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g2date_h
+#define eccodes_accessor_g2date_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_g2date_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in g2date */
+    const char* century;
+    const char* year;
+    const char* month;
+    const char* day;
+};
+
+class grib_accessor_class_g2date_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_g2date_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g2date_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_g2date_h */
diff --git a/src/accessor/todo/grib_accessor_class_g2end_step.cc b/src/accessor/grib_accessor_class_g2end_step.cc
similarity index 76%
rename from src/accessor/todo/grib_accessor_class_g2end_step.cc
rename to src/accessor/grib_accessor_class_g2end_step.cc
index a86733eb3..947b867fd 100644
--- a/src/accessor/todo/grib_accessor_class_g2end_step.cc
+++ b/src/accessor/grib_accessor_class_g2end_step.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,150 +10,17 @@
  */
 
 #include "grib_api_internal.h"
+#include "grib_accessor_class_g2end_step.h"
 #include "step.h"
 #include "step_utilities.h"
 #include <stdexcept>
 
-/*
-  This is used by make_class.pl
-
-  START_CLASS_DEF
-  CLASS      = accessor
-  SUPER      = grib_accessor_class_long
-  IMPLEMENTS = unpack_long;pack_long
-  IMPLEMENTS = unpack_double
-  IMPLEMENTS = unpack_string;pack_string
-  IMPLEMENTS = init;dump
-  IMPLEMENTS = get_native_type
-  MEMBERS = const char* start_step_value
-  MEMBERS = const char* step_units
-
-  MEMBERS = const char* year
-  MEMBERS = const char* month
-  MEMBERS = const char* day
-  MEMBERS = const char* hour
-  MEMBERS = const char* minute
-  MEMBERS = const char* second
-
-  MEMBERS = const char* year_of_end_of_interval
-  MEMBERS = const char* month_of_end_of_interval
-  MEMBERS = const char* day_of_end_of_interval
-  MEMBERS = const char* hour_of_end_of_interval
-  MEMBERS = const char* minute_of_end_of_interval
-  MEMBERS = const char* second_of_end_of_interval
-
-  MEMBERS = const char* time_range_unit
-  MEMBERS = const char* time_range_value
-  MEMBERS = const char* typeOfTimeIncrement
-  MEMBERS = const char* numberOfTimeRange
-
-  END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int pack_string(grib_accessor*, const char*, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_g2end_step
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in g2end_step */
-    const char* start_step_value;
-    const char* step_units;
-    const char* year;
-    const char* month;
-    const char* day;
-    const char* hour;
-    const char* minute;
-    const char* second;
-    const char* year_of_end_of_interval;
-    const char* month_of_end_of_interval;
-    const char* day_of_end_of_interval;
-    const char* hour_of_end_of_interval;
-    const char* minute_of_end_of_interval;
-    const char* second_of_end_of_interval;
-    const char* time_range_unit;
-    const char* time_range_value;
-    const char* typeOfTimeIncrement;
-    const char* numberOfTimeRange;
-} grib_accessor_g2end_step;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_g2end_step = {
-    &grib_accessor_class_long,                      /* super */
-    "g2end_step",                      /* name */
-    sizeof(grib_accessor_g2end_step),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    &pack_string,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
+grib_accessor_class_g2end_step_t _grib_accessor_class_g2end_step{"g2end_step"};
 grib_accessor_class* grib_accessor_class_g2end_step = &_grib_accessor_class_g2end_step;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_g2end_step* self = (grib_accessor_g2end_step*)a;
+void grib_accessor_class_g2end_step_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_g2end_step_t* self = (grib_accessor_g2end_step_t*)a;
     int n = 0;
     grib_handle* h = grib_handle_of_accessor(a);
 
@@ -179,14 +47,12 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
     self->numberOfTimeRange   = grib_arguments_get_name(h, c, n++);
 }
 
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
+void grib_accessor_class_g2end_step_t::dump(grib_accessor* a, grib_dumper* dumper){
     grib_dump_double(dumper, a, NULL);
 }
 
 // See GRIB-488
-static bool is_special_expver(const grib_handle* h)
-{
+bool is_special_expver(const grib_handle* h){
     int ret = 0;
     char strMarsExpVer[50] = {0,};
     char strMarsClass[50] = {0,};
@@ -225,9 +91,8 @@ static int convert_time_range_long_(
     return GRIB_SUCCESS;
 }
 
-static int unpack_one_time_range_long_(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_g2end_step* self = (grib_accessor_g2end_step*)a;
+int unpack_one_time_range_long_(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_g2end_step_t* self = (grib_accessor_g2end_step_t*)a;
     int err = 0;
     long start_step_value;
     long step_units;
@@ -270,9 +135,8 @@ static int unpack_one_time_range_long_(grib_accessor* a, long* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int unpack_one_time_range_double_(grib_accessor* a, double *val , size_t* len)
-{
-    grib_accessor_g2end_step* self = (grib_accessor_g2end_step*)a;
+int unpack_one_time_range_double_(grib_accessor* a, double *val , size_t* len){
+    grib_accessor_g2end_step_t* self = (grib_accessor_g2end_step_t*)a;
     int err = 0;
     double start_step_value;
     long start_step_unit;
@@ -319,9 +183,8 @@ static int unpack_one_time_range_double_(grib_accessor* a, double *val , size_t*
 }
 
 #define MAX_NUM_TIME_RANGES 16 /* maximum number of time range specifications */
-static int unpack_multiple_time_ranges_long_(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_g2end_step* self = (grib_accessor_g2end_step*)a;
+int unpack_multiple_time_ranges_long_(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_g2end_step_t* self = (grib_accessor_g2end_step_t*)a;
     int i = 0, err = 0;
     grib_handle* h = grib_handle_of_accessor(a);
     long numberOfTimeRange = 0, step_units = 0, start_step_value = 0;
@@ -372,9 +235,8 @@ static int unpack_multiple_time_ranges_long_(grib_accessor* a, long* val, size_t
     return GRIB_DECODING_ERROR;
 }
 
-static int unpack_multiple_time_ranges_double_(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_g2end_step* self = (grib_accessor_g2end_step*)a;
+int unpack_multiple_time_ranges_double_(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_g2end_step_t* self = (grib_accessor_g2end_step_t*)a;
     int i = 0, err = 0;
     grib_handle* h = grib_handle_of_accessor(a);
     long numberOfTimeRange = 0;
@@ -435,9 +297,8 @@ static int unpack_multiple_time_ranges_double_(grib_accessor* a, double* val, si
 // For the old implementation of unpack_long, see
 //  src/deprecated/grib_accessor_class_g2end_step.unpack_long.cc
 //
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_g2end_step* self = (grib_accessor_g2end_step*)a;
+int grib_accessor_class_g2end_step_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_g2end_step_t* self = (grib_accessor_g2end_step_t*)a;
     grib_handle* h = grib_handle_of_accessor(a);
     int ret = 0;
     long start_step_value;
@@ -466,16 +327,15 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
         }
     }
     catch (std::exception& e) {
-        grib_context_log(h->context, GRIB_LOG_ERROR, "grib_accessor_g2end_step::unpack_long: %s", e.what());
+        grib_context_log(h->context, GRIB_LOG_ERROR, "grib_accessor_g2end_step_t::unpack_long: %s", e.what());
         ret = GRIB_DECODING_ERROR;
     }
 
     return ret;
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_g2end_step* self = (grib_accessor_g2end_step*)a;
+int grib_accessor_class_g2end_step_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_g2end_step_t* self = (grib_accessor_g2end_step_t*)a;
     grib_handle* h = grib_handle_of_accessor(a);
     int ret = 0;
     long start_step_value;
@@ -504,16 +364,15 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
         }
     }
     catch (std::exception& e) {
-        grib_context_log(h->context, GRIB_LOG_ERROR, "grib_accessor_g2end_step::unpack_double: %s", e.what());
+        grib_context_log(h->context, GRIB_LOG_ERROR, "grib_accessor_g2end_step_t::unpack_double: %s", e.what());
         ret = GRIB_DECODING_ERROR;
     }
 
     return ret;
 }
 
-static int pack_long_(grib_accessor* a, const long end_step_value, const long end_step_unit)
-{
-    grib_accessor_g2end_step* self = (grib_accessor_g2end_step*)a;
+int pack_long_(grib_accessor* a, const long end_step_value, const long end_step_unit){
+    grib_accessor_g2end_step_t* self = (grib_accessor_g2end_step_t*)a;
     grib_handle* h = grib_handle_of_accessor(a);
     int err = 0;
 
@@ -641,9 +500,8 @@ static int pack_long_(grib_accessor* a, const long end_step_value, const long en
     return GRIB_SUCCESS;
 }
 
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    grib_accessor_g2end_step* self = (grib_accessor_g2end_step*)a;
+int grib_accessor_class_g2end_step_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    grib_accessor_g2end_step_t* self = (grib_accessor_g2end_step_t*)a;
     grib_handle* h = grib_handle_of_accessor(a);
     int ret = 0;
     char fp_format[128] = "%g";
@@ -678,15 +536,14 @@ static int unpack_string(grib_accessor* a, char* val, size_t* len)
         memcpy(val, ss.str().c_str(), size);
     }
     catch (std::exception& e) {
-        grib_context_log(h->context, GRIB_LOG_ERROR, "grib_accessor_g2end_step::unpack_string: %s", e.what());
+        grib_context_log(h->context, GRIB_LOG_ERROR, "grib_accessor_g2end_step_t::unpack_string: %s", e.what());
         return GRIB_DECODING_ERROR;
     }
 
     return GRIB_SUCCESS;
 }
 
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
+int grib_accessor_class_g2end_step_t::pack_long(grib_accessor* a, const long* val, size_t* len){
     grib_handle* h = grib_handle_of_accessor(a);
     int ret;
 
@@ -709,14 +566,13 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
         ret = pack_long_(a, *val, end_step_unit);
     }
     catch (std::exception& e) {
-        grib_context_log(h->context, GRIB_LOG_ERROR, "grib_accessor_g2end_step::pack_long: %s", e.what());
+        grib_context_log(h->context, GRIB_LOG_ERROR, "grib_accessor_g2end_step_t::pack_long: %s", e.what());
         return GRIB_DECODING_ERROR;
     }
     return ret;
 }
 
-static int pack_string(grib_accessor* a, const char* val, size_t* len)
-{
+int grib_accessor_class_g2end_step_t::pack_string(grib_accessor* a, const char* val, size_t* len){
     grib_handle* h = grib_handle_of_accessor(a);
     int ret = 0;
     long force_step_units;
@@ -734,14 +590,13 @@ static int pack_string(grib_accessor* a, const char* val, size_t* len)
             return ret;
     }
     catch (std::exception& e) {
-        grib_context_log(h->context, GRIB_LOG_ERROR, "grib_accessor_g2end_step::pack_string: %s", e.what());
+        grib_context_log(h->context, GRIB_LOG_ERROR, "grib_accessor_g2end_step_t::pack_string: %s", e.what());
         return GRIB_DECODING_ERROR;
     }
     return GRIB_SUCCESS;
 }
 
-static int get_native_type(grib_accessor* a)
-{
+int grib_accessor_class_g2end_step_t::get_native_type(grib_accessor* a){
     grib_handle* h = grib_handle_of_accessor(a);
     const int show_units_for_hours = a->context->grib_hourly_steps_with_units;
 
diff --git a/src/accessor/grib_accessor_class_g2end_step.h b/src/accessor/grib_accessor_class_g2end_step.h
new file mode 100644
index 000000000..7a2d8ab21
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g2end_step.h
@@ -0,0 +1,56 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g2end_step_h
+#define eccodes_accessor_g2end_step_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_g2end_step_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in g2end_step */
+    const char* start_step_value;
+    const char* step_units;
+    const char* year;
+    const char* month;
+    const char* day;
+    const char* hour;
+    const char* minute;
+    const char* second;
+    const char* year_of_end_of_interval;
+    const char* month_of_end_of_interval;
+    const char* day_of_end_of_interval;
+    const char* hour_of_end_of_interval;
+    const char* minute_of_end_of_interval;
+    const char* second_of_end_of_interval;
+    const char* time_range_unit;
+    const char* time_range_value;
+    const char* typeOfTimeIncrement;
+    const char* numberOfTimeRange;
+};
+
+class grib_accessor_class_g2end_step_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_g2end_step_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g2end_step_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int pack_string(grib_accessor*, const char*, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_g2end_step_h */
diff --git a/src/accessor/todo/grib_accessor_class_g2grid.cc b/src/accessor/grib_accessor_class_g2grid.cc
similarity index 58%
rename from src/accessor/todo/grib_accessor_class_g2grid.cc
rename to src/accessor/grib_accessor_class_g2grid.cc
index 40aaca628..74f276c62 100644
--- a/src/accessor/todo/grib_accessor_class_g2grid.cc
+++ b/src/accessor/grib_accessor_class_g2grid.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,116 +10,14 @@
  */
 
 #include "grib_api_internal.h"
-#include <cmath>
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_double
-   IMPLEMENTS = unpack_double;pack_double;value_count
-   IMPLEMENTS = init
-   MEMBERS=const char*                  latitude_first
-   MEMBERS=const char*                  longitude_first
-   MEMBERS=const char*                  latitude_last
-   MEMBERS=const char*                  longitude_last
-   MEMBERS=const char*                  i_increment
-   MEMBERS=const char*                  j_increment
-   MEMBERS=const char*                  basic_angle
-   MEMBERS=const char*                  sub_division
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_g2grid
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in g2grid */
-    const char*                  latitude_first;
-    const char*                  longitude_first;
-    const char*                  latitude_last;
-    const char*                  longitude_last;
-    const char*                  i_increment;
-    const char*                  j_increment;
-    const char*                  basic_angle;
-    const char*                  sub_division;
-} grib_accessor_g2grid;
-
-extern grib_accessor_class* grib_accessor_class_double;
-
-static grib_accessor_class _grib_accessor_class_g2grid = {
-    &grib_accessor_class_double,                      /* super */
-    "g2grid",                      /* name */
-    sizeof(grib_accessor_g2grid),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_g2grid.h"
 
+grib_accessor_class_g2grid_t _grib_accessor_class_g2grid{"g2grid"};
 grib_accessor_class* grib_accessor_class_g2grid = &_grib_accessor_class_g2grid;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_g2grid* self = (grib_accessor_g2grid*)a;
+void grib_accessor_class_g2grid_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_g2grid_t* self = (grib_accessor_g2grid_t*)a;
     grib_handle* hand          = grib_handle_of_accessor(a);
     int n                      = 0;
 
@@ -136,8 +35,7 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
         GRIB_ACCESSOR_FLAG_READ_ONLY;
 }
 
-static int value_count(grib_accessor* a, long* count)
-{
+int grib_accessor_class_g2grid_t::value_count(grib_accessor* a, long* count){
     *count = 6;
     return 0;
 }
@@ -145,9 +43,8 @@ static int value_count(grib_accessor* a, long* count)
 // GRIB edition 2 uses microdegrees
 #define ANGLE_SUBDIVISIONS (1000 * 1000)
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_g2grid* self = (grib_accessor_g2grid*)a;
+int grib_accessor_class_g2grid_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_g2grid_t* self = (grib_accessor_g2grid_t*)a;
     grib_handle* hand          = grib_handle_of_accessor(a);
     int ret                    = 0;
 
@@ -208,8 +105,7 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static long gcd(long a, long b)
-{
+long gcd(long a, long b){
     if (b > a)
         return gcd(b, a);
     if (b == 0)
@@ -217,13 +113,11 @@ static long gcd(long a, long b)
     return gcd(b, a % b);
 }
 
-static long lcm(long a, long b)
-{
+long lcm(long a, long b){
     return a * b / gcd(a, b);
 }
 
-static int is_ok(const double* val, long v[6], double basic_angle, double sub_division)
-{
+int is_ok(const double* val, long v[6], double basic_angle, double sub_division){
     int i;
     int ok = 1;
 
@@ -247,8 +141,7 @@ static int is_ok(const double* val, long v[6], double basic_angle, double sub_di
     return ok;
 }
 
-static int trial(const double* val, long v[6], long* basic_angle, long* sub_division)
-{
+int trial(const double* val, long v[6], long* basic_angle, long* sub_division){
     int i = 0;
     long ni, nj;
 
@@ -278,9 +171,8 @@ static int trial(const double* val, long v[6], long* basic_angle, long* sub_divi
     return is_ok(val, v, *basic_angle, *sub_division);
 }
 
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_g2grid* self = (grib_accessor_g2grid*)a;
+int grib_accessor_class_g2grid_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_g2grid_t* self = (grib_accessor_g2grid_t*)a;
     grib_handle* hand          = grib_handle_of_accessor(a);
     int ret;
     long v[6];
diff --git a/src/accessor/grib_accessor_class_g2grid.h b/src/accessor/grib_accessor_class_g2grid.h
new file mode 100644
index 000000000..0cd177ce5
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g2grid.h
@@ -0,0 +1,42 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g2grid_h
+#define eccodes_accessor_g2grid_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_double.h"
+
+class grib_accessor_g2grid_t : public grib_accessor_double_t
+{
+public:
+    /* Members defined in g2grid */
+    const char*                  latitude_first;
+    const char*                  longitude_first;
+    const char*                  latitude_last;
+    const char*                  longitude_last;
+    const char*                  i_increment;
+    const char*                  j_increment;
+    const char*                  basic_angle;
+    const char*                  sub_division;
+};
+
+class grib_accessor_class_g2grid_t : public grib_accessor_class_double_t
+{
+public:
+    grib_accessor_class_g2grid_t(const char* name) : grib_accessor_class_double_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g2grid_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_g2grid_h */
diff --git a/src/accessor/grib_accessor_class_g2latlon.cc b/src/accessor/grib_accessor_class_g2latlon.cc
new file mode 100644
index 000000000..f3d64f1e6
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g2latlon.cc
@@ -0,0 +1,115 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_g2latlon.h"
+
+grib_accessor_class_g2latlon_t _grib_accessor_class_g2latlon{"g2latlon"};
+grib_accessor_class* grib_accessor_class_g2latlon = &_grib_accessor_class_g2latlon;
+
+
+void grib_accessor_class_g2latlon_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_g2latlon_t* self = (grib_accessor_g2latlon_t*)a;
+    int n                        = 0;
+
+    self->grid  = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->index = grib_arguments_get_long(grib_handle_of_accessor(a), c, n++);
+    self->given = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+}
+
+int grib_accessor_class_g2latlon_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_g2latlon_t* self = (grib_accessor_g2latlon_t*)a;
+    int ret                      = 0;
+
+    long given = 1;
+    double grid[6];
+    size_t size = 6;
+
+    if (*len < 1) {
+        ret = GRIB_ARRAY_TOO_SMALL;
+        return ret;
+    }
+
+    if (self->given)
+        if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->given, &given)) != GRIB_SUCCESS)
+            return ret;
+
+    if (!given) {
+        *val = GRIB_MISSING_DOUBLE;
+        return GRIB_SUCCESS;
+    }
+
+    if ((ret = grib_get_double_array_internal(grib_handle_of_accessor(a), self->grid, grid, &size)) != GRIB_SUCCESS)
+        return ret;
+
+    *val = grid[self->index];
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_g2latlon_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_g2latlon_t* self = (grib_accessor_g2latlon_t*)a;
+    int ret                      = 0;
+    double grid[6];
+    size_t size    = 6;
+    double new_val = *val;
+    grib_handle* hand = grib_handle_of_accessor(a);
+
+    if (*len < 1) {
+        ret = GRIB_ARRAY_TOO_SMALL;
+        return ret;
+    }
+
+    if (self->given) {
+        long given = *val != GRIB_MISSING_DOUBLE;
+        if ((ret = grib_set_long_internal(hand, self->given, given)) != GRIB_SUCCESS)
+            return ret;
+    }
+
+    if ((ret = grib_get_double_array_internal(hand, self->grid, grid, &size)) != GRIB_SUCCESS)
+        return ret;
+
+    /* index 1 is longitudeOfFirstGridPointInDegrees
+     * index 3 is longitudeOfLastGridPointInDegrees
+     */
+    if ((self->index == 1 || self->index == 3)) {
+        /* WMO regulation for GRIB edition 2:
+         * The longitude values shall be limited to the range 0 to 360 degrees inclusive */
+        new_val = normalise_longitude_in_degrees(*val);
+        if (hand->context->debug && new_val != *val) {
+            fprintf(stderr, "ECCODES DEBUG pack_double g2latlon: normalise longitude %g -> %g\n", *val, new_val);
+        }
+    }
+    grid[self->index] = new_val;
+
+    return grib_set_double_array_internal(hand, self->grid, grid, size);
+}
+
+int grib_accessor_class_g2latlon_t::pack_missing(grib_accessor* a){
+    grib_accessor_g2latlon_t* self = (grib_accessor_g2latlon_t*)a;
+    double missing               = GRIB_MISSING_DOUBLE;
+    size_t size                  = 1;
+
+    if (!self->given)
+        return GRIB_NOT_IMPLEMENTED;
+
+    return pack_double(a, &missing, &size);
+}
+
+int grib_accessor_class_g2latlon_t::is_missing(grib_accessor* a){
+    grib_accessor_g2latlon_t* self = (grib_accessor_g2latlon_t*)a;
+    long given                   = 1;
+
+    if (self->given)
+        grib_get_long_internal(grib_handle_of_accessor(a), self->given, &given);
+
+    return !given;
+}
diff --git a/src/accessor/grib_accessor_class_g2latlon.h b/src/accessor/grib_accessor_class_g2latlon.h
new file mode 100644
index 000000000..f16e2623e
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g2latlon.h
@@ -0,0 +1,38 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g2latlon_h
+#define eccodes_accessor_g2latlon_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_double.h"
+
+class grib_accessor_g2latlon_t : public grib_accessor_double_t
+{
+public:
+    /* Members defined in g2latlon */
+    const char*                  grid;
+    int                          index;
+    const char*                  given;
+};
+
+class grib_accessor_class_g2latlon_t : public grib_accessor_class_double_t
+{
+public:
+    grib_accessor_class_g2latlon_t(const char* name) : grib_accessor_class_double_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g2latlon_t{}; }
+    int pack_missing(grib_accessor*) override;
+    int is_missing(grib_accessor*) override;
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_g2latlon_h */
diff --git a/src/accessor/todo/grib_accessor_class_g2level.cc b/src/accessor/grib_accessor_class_g2level.cc
similarity index 66%
rename from src/accessor/todo/grib_accessor_class_g2level.cc
rename to src/accessor/grib_accessor_class_g2level.cc
index 39bd79033..084b6eba9 100644
--- a/src/accessor/todo/grib_accessor_class_g2level.cc
+++ b/src/accessor/grib_accessor_class_g2level.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,110 +10,14 @@
  */
 
 #include "grib_api_internal.h"
+#include "grib_accessor_class_g2level.h"
 
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_double;pack_double
-   IMPLEMENTS = unpack_long;pack_long;init;is_missing
-   MEMBERS=const char* type_first
-   MEMBERS=const char* scale_first
-   MEMBERS=const char* value_first
-   MEMBERS=const char* pressure_units
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int is_missing(grib_accessor*);
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_g2level
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in g2level */
-    const char* type_first;
-    const char* scale_first;
-    const char* value_first;
-    const char* pressure_units;
-} grib_accessor_g2level;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_g2level = {
-    &grib_accessor_class_long,                      /* super */
-    "g2level",                      /* name */
-    sizeof(grib_accessor_g2level),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    &is_missing,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
+grib_accessor_class_g2level_t _grib_accessor_class_g2level{"g2level"};
 grib_accessor_class* grib_accessor_class_g2level = &_grib_accessor_class_g2level;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_g2level* self = (grib_accessor_g2level*)a;
+void grib_accessor_class_g2level_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_g2level_t* self = (grib_accessor_g2level_t*)a;
     grib_handle* hand           = grib_handle_of_accessor(a);
     int n                       = 0;
 
@@ -125,18 +30,16 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
     a->flags |= GRIB_ACCESSOR_FLAG_COPY_IF_CHANGING_EDITION;
 }
 
-static bool is_tigge(grib_handle* h)
-{
+bool is_tigge(grib_handle* h){
     long productionStatus = 0;
     int err = grib_get_long(h, "productionStatusOfProcessedData", &productionStatus);
     if (err) return false;
     return (productionStatus == 4 || productionStatus == 5);
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
+int grib_accessor_class_g2level_t::unpack_double(grib_accessor* a, double* val, size_t* len){
     int ret                     = 0;
-    grib_accessor_g2level* self = (grib_accessor_g2level*)a;
+    grib_accessor_g2level_t* self = (grib_accessor_g2level_t*)a;
     grib_handle* hand           = grib_handle_of_accessor(a);
 
     long type_first         = 0;
@@ -211,8 +114,7 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
+int grib_accessor_class_g2level_t::unpack_long(grib_accessor* a, long* val, size_t* len){
     double dval = 0;
     int ret     = unpack_double(a, &dval, len);
     if (ret == GRIB_SUCCESS) {
@@ -221,9 +123,8 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
     return ret;
 }
 
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_g2level* self = (grib_accessor_g2level*)a;
+int grib_accessor_class_g2level_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_g2level_t* self = (grib_accessor_g2level_t*)a;
     grib_handle* hand          = grib_handle_of_accessor(a);
     int ret                    = 0;
     double value_first         = *val;
@@ -284,8 +185,7 @@ static int pack_double(grib_accessor* a, const double* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
+int grib_accessor_class_g2level_t::pack_long(grib_accessor* a, const long* val, size_t* len){
     int ret                 = 0;
     long value_first        = *val;
     long scale_first        = 0;
@@ -293,7 +193,7 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
     char pressure_units[10] = {0,};
     size_t pressure_units_len = 10;
 
-    grib_accessor_g2level* self = (grib_accessor_g2level*)a;
+    grib_accessor_g2level_t* self = (grib_accessor_g2level_t*)a;
     grib_handle* hand           = grib_handle_of_accessor(a);
     int change_scale_and_value  = 1;
     bool tigge = is_tigge(hand);
@@ -359,14 +259,12 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int is_missing(grib_accessor* a)
-{
-    grib_accessor_g2level* self = (grib_accessor_g2level*)a;
+int grib_accessor_class_g2level_t::is_missing(grib_accessor* a){
+    grib_accessor_g2level_t* self = (grib_accessor_g2level_t*)a;
     grib_handle* hand           = grib_handle_of_accessor(a);
     int err                     = 0;
     int ret                     = 0;
 
     ret = grib_is_missing(hand, self->scale_first, &err) +
-          grib_is_missing(hand, self->value_first, &err);
-    return ret;
+          grib_is_missing(hand, self->value_first, &err);    return ret;
 }
diff --git a/src/accessor/grib_accessor_class_g2level.h b/src/accessor/grib_accessor_class_g2level.h
new file mode 100644
index 000000000..567b8c1b4
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g2level.h
@@ -0,0 +1,40 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g2level_h
+#define eccodes_accessor_g2level_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_g2level_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in g2level */
+    const char* type_first;
+    const char* scale_first;
+    const char* value_first;
+    const char* pressure_units;
+};
+
+class grib_accessor_class_g2level_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_g2level_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g2level_t{}; }
+    int is_missing(grib_accessor*) override;
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_g2level_h */
diff --git a/src/accessor/grib_accessor_class_g2lon.cc b/src/accessor/grib_accessor_class_g2lon.cc
new file mode 100644
index 000000000..1ef641a89
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g2lon.cc
@@ -0,0 +1,58 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_g2lon.h"
+
+grib_accessor_class_g2lon_t _grib_accessor_class_g2lon{"g2lon"};
+grib_accessor_class* grib_accessor_class_g2lon = &_grib_accessor_class_g2lon;
+
+
+void grib_accessor_class_g2lon_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_g2lon_t* self = (grib_accessor_g2lon_t*)a;
+    int n                     = 0;
+
+    self->longitude = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+}
+
+int grib_accessor_class_g2lon_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_g2lon_t* self = (grib_accessor_g2lon_t*)a;
+    int ret                   = 0;
+    long longitude;
+
+    if ((ret = grib_get_long(grib_handle_of_accessor(a), self->longitude, &longitude)) != GRIB_SUCCESS)
+        return ret;
+
+    if (longitude == GRIB_MISSING_LONG) {
+        *val = GRIB_MISSING_DOUBLE;
+        return GRIB_SUCCESS;
+    }
+
+    *val = ((double)longitude) / 1000000.0;
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_g2lon_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_g2lon_t* self = (grib_accessor_g2lon_t*)a;
+    long longitude;
+    double value = *val;
+
+    if (value == GRIB_MISSING_DOUBLE) {
+        longitude = GRIB_MISSING_LONG;
+    }
+    else {
+        if (value < 0)
+            value += 360;
+        longitude = (long)(value * 1000000);
+    }
+    return grib_set_long(grib_handle_of_accessor(a), self->longitude, longitude);
+}
diff --git a/src/accessor/grib_accessor_class_g2lon.h b/src/accessor/grib_accessor_class_g2lon.h
new file mode 100644
index 000000000..d17a68c14
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g2lon.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g2lon_h
+#define eccodes_accessor_g2lon_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_double.h"
+
+class grib_accessor_g2lon_t : public grib_accessor_double_t
+{
+public:
+    /* Members defined in g2lon */
+    const char* longitude;
+};
+
+class grib_accessor_class_g2lon_t : public grib_accessor_class_double_t
+{
+public:
+    grib_accessor_class_g2lon_t(const char* name) : grib_accessor_class_double_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g2lon_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_g2lon_h */
diff --git a/src/accessor/todo/grib_accessor_class_g2step_range.cc b/src/accessor/grib_accessor_class_g2step_range.cc
similarity index 64%
rename from src/accessor/todo/grib_accessor_class_g2step_range.cc
rename to src/accessor/grib_accessor_class_g2step_range.cc
index c39601a40..ca7595ace 100644
--- a/src/accessor/todo/grib_accessor_class_g2step_range.cc
+++ b/src/accessor/grib_accessor_class_g2step_range.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,116 +10,20 @@
  */
 
 #include "grib_api_internal.h"
-#include "step.h"
-#include "step_utilities.h"
+#include "grib_accessor_class_g2step_range.h"
+#include "../step.h"
+#include "../step_utilities.h"
 #include <vector>
 #include <sstream>
 #include <iostream>
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = pack_string;unpack_string;value_count
-   IMPLEMENTS = unpack_long;pack_long
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = unpack_string;pack_string
-   IMPLEMENTS = get_native_type;string_length
-   IMPLEMENTS = init
-   MEMBERS    = const char* start_step
-   MEMBERS    = const char* end_step
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int pack_string(grib_accessor*, const char*, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static size_t string_length(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_g2step_range
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in g2step_range */
-    const char* start_step;
-    const char* end_step;
-} grib_accessor_g2step_range;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_g2step_range = {
-    &grib_accessor_class_gen,                      /* super */
-    "g2step_range",                      /* name */
-    sizeof(grib_accessor_g2step_range),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    &string_length,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    &pack_string,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
 
 
+grib_accessor_class_g2step_range_t _grib_accessor_class_g2step_range{"g2step_range"};
 grib_accessor_class* grib_accessor_class_g2step_range = &_grib_accessor_class_g2step_range;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_g2step_range* self = (grib_accessor_g2step_range*)a;
+void grib_accessor_class_g2step_range_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_g2step_range_t* self = (grib_accessor_g2step_range_t*)a;
 
     int n = 0;
 
@@ -133,9 +38,8 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
     //grib_dump_string(dumper, a, NULL);
 //}
 
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    grib_accessor_g2step_range* self = (grib_accessor_g2step_range*)a;
+int grib_accessor_class_g2step_range_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    grib_accessor_g2step_range_t* self = (grib_accessor_g2step_range_t*)a;
     grib_handle* h                   = grib_handle_of_accessor(a);
     int ret     = 0;
     size_t size = 0;
@@ -189,7 +93,7 @@ static int unpack_string(grib_accessor* a, char* val, size_t* len)
         memcpy(val, ss.str().c_str(), size);
     }
     catch (std::exception& e) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "grib_accessor_g2step_range::unpack_string: %s", e.what());
+        grib_context_log(a->context, GRIB_LOG_ERROR, "grib_accessor_g2step_range_t::unpack_string: %s", e.what());
         return GRIB_DECODING_ERROR;
     }
 
@@ -201,9 +105,8 @@ static int unpack_string(grib_accessor* a, char* val, size_t* len)
 // <start_step> and <end_step> can be in different units
 // stepRange="X" in instantaneous field is equivalent to set step=X
 // stepRange="X" in accumulated field is equivalent to startStep=X, endStep=startStep
-static int pack_string(grib_accessor* a, const char* val, size_t* len)
-{
-    grib_accessor_g2step_range* self = (grib_accessor_g2step_range*)a;
+int grib_accessor_class_g2step_range_t::pack_string(grib_accessor* a, const char* val, size_t* len){
+    grib_accessor_g2step_range_t* self = (grib_accessor_g2step_range_t*)a;
     grib_handle* h                   = grib_handle_of_accessor(a);
     int ret = 0;
 
@@ -259,19 +162,16 @@ static int pack_string(grib_accessor* a, const char* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int value_count(grib_accessor* a, long* count)
-{
+int grib_accessor_class_g2step_range_t::value_count(grib_accessor* a, long* count){
     *count = 1;
     return 0;
 }
 
-static size_t string_length(grib_accessor* a)
-{
+size_t grib_accessor_class_g2step_range_t::string_length(grib_accessor* a){
     return 255;
 }
 
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
+int grib_accessor_class_g2step_range_t::pack_long(grib_accessor* a, const long* val, size_t* len){
     char buff[100];
     size_t bufflen = 100;
 
@@ -280,9 +180,8 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
 }
 
 
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_g2step_range* self = (grib_accessor_g2step_range*)a;
+int grib_accessor_class_g2step_range_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_g2step_range_t* self = (grib_accessor_g2step_range_t*)a;
     grib_handle* h                   = grib_handle_of_accessor(a);
     int ret     = 0;
     long end_start_value = 0;
@@ -319,9 +218,8 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
 }
 
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_g2step_range* self = (grib_accessor_g2step_range*)a;
+int grib_accessor_class_g2step_range_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_g2step_range_t* self = (grib_accessor_g2step_range_t*)a;
     grib_handle* h                   = grib_handle_of_accessor(a);
     int ret     = 0;
     double end_start_value = 0;
@@ -359,7 +257,6 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
 }
 
 
-static int get_native_type(grib_accessor* a)
-{
+int grib_accessor_class_g2step_range_t::get_native_type(grib_accessor* a){
     return GRIB_TYPE_STRING;
 }
diff --git a/src/accessor/grib_accessor_class_g2step_range.h b/src/accessor/grib_accessor_class_g2step_range.h
new file mode 100644
index 000000000..c5a007806
--- /dev/null
+++ b/src/accessor/grib_accessor_class_g2step_range.h
@@ -0,0 +1,41 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_g2step_range_h
+#define eccodes_accessor_g2step_range_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_g2step_range_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in g2step_range */
+    const char* start_step;
+    const char* end_step;
+};
+
+class grib_accessor_class_g2step_range_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_g2step_range_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_g2step_range_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int pack_string(grib_accessor*, const char*, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    size_t string_length(grib_accessor*) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_g2step_range_h */
diff --git a/src/accessor/grib_accessor_class_gaussian_grid_name.cc b/src/accessor/grib_accessor_class_gaussian_grid_name.cc
new file mode 100644
index 000000000..7b27f2c05
--- /dev/null
+++ b/src/accessor/grib_accessor_class_gaussian_grid_name.cc
@@ -0,0 +1,84 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_gaussian_grid_name.h"
+
+grib_accessor_class_gaussian_grid_name_t _grib_accessor_class_gaussian_grid_name{"gaussian_grid_name"};
+grib_accessor_class* grib_accessor_class_gaussian_grid_name = &_grib_accessor_class_gaussian_grid_name;
+
+
+void grib_accessor_class_gaussian_grid_name_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    grib_accessor_gaussian_grid_name_t* self = (grib_accessor_gaussian_grid_name_t*)a;
+    int n                                  = 0;
+
+    self->N            = grib_arguments_get_name(a->parent->h, arg, n++);
+    self->Ni           = grib_arguments_get_name(a->parent->h, arg, n++);
+    self->isOctahedral = grib_arguments_get_name(a->parent->h, arg, n++);
+    a->length          = 0;
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->flags |= GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC;
+}
+
+int grib_accessor_class_gaussian_grid_name_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_STRING;
+}
+
+#define MAX_GRIDNAME_LEN 16
+
+int grib_accessor_class_gaussian_grid_name_t::unpack_string(grib_accessor* a, char* v, size_t* len){
+    grib_accessor_gaussian_grid_name_t* self = (grib_accessor_gaussian_grid_name_t*)a;
+
+    long N = 0, Ni = 0;
+    char tmp[MAX_GRIDNAME_LEN] = {0,};
+    size_t length = 0;
+    int ret       = GRIB_SUCCESS;
+
+    if ((ret = grib_get_long_internal(a->parent->h, self->N, &N)) != GRIB_SUCCESS)
+        return ret;
+    if ((ret = grib_get_long_internal(a->parent->h, self->Ni, &Ni)) != GRIB_SUCCESS)
+        return ret;
+
+    if (Ni == GRIB_MISSING_LONG) {
+        /* Reduced gaussian grid */
+        long isOctahedral = 0;
+        if ((ret = grib_get_long_internal(a->parent->h, self->isOctahedral, &isOctahedral)) != GRIB_SUCCESS)
+            return ret;
+        if (isOctahedral == 1) {
+            snprintf(tmp, sizeof(tmp), "O%ld", N);
+        }
+        else {
+            snprintf(tmp, sizeof(tmp), "N%ld", N); /* Classic */
+        }
+    }
+    else {
+        /* Regular gaussian grid */
+        snprintf(tmp, sizeof(tmp), "F%ld", N);
+    }
+    length = strlen(tmp) + 1;
+
+    if (*len < length) {
+        const char* cclass_name = a->cclass->name;
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
+                         cclass_name, a->name, length, *len);
+        *len = length;
+        return GRIB_BUFFER_TOO_SMALL;
+    }
+
+    strcpy(v, tmp);
+    *len = length;
+    return GRIB_SUCCESS;
+}
+
+size_t grib_accessor_class_gaussian_grid_name_t::string_length(grib_accessor* a){
+    return MAX_GRIDNAME_LEN;
+}
diff --git a/src/accessor/grib_accessor_class_gaussian_grid_name.h b/src/accessor/grib_accessor_class_gaussian_grid_name.h
new file mode 100644
index 000000000..1c12bfacd
--- /dev/null
+++ b/src/accessor/grib_accessor_class_gaussian_grid_name.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_gaussian_grid_name_h
+#define eccodes_accessor_gaussian_grid_name_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_gaussian_grid_name_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in gaussian_grid_name */
+    const char* N;
+    const char* Ni;
+    const char* isOctahedral;
+};
+
+class grib_accessor_class_gaussian_grid_name_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_gaussian_grid_name_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_gaussian_grid_name_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    size_t string_length(grib_accessor*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_gaussian_grid_name_h */
diff --git a/src/accessor/grib_accessor_class_gds_is_present.cc b/src/accessor/grib_accessor_class_gds_is_present.cc
new file mode 100644
index 000000000..4939d0949
--- /dev/null
+++ b/src/accessor/grib_accessor_class_gds_is_present.cc
@@ -0,0 +1,86 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_gds_is_present.h"
+
+grib_accessor_class_gds_is_present_t _grib_accessor_class_gds_is_present{"gds_is_present"};
+grib_accessor_class* grib_accessor_class_gds_is_present = &_grib_accessor_class_gds_is_present;
+
+
+void grib_accessor_class_gds_is_present_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    int n                              = 0;
+    grib_accessor_gds_is_present_t* self = (grib_accessor_gds_is_present_t*)a;
+    grib_handle* h                     = grib_handle_of_accessor(a);
+    self->gds_present                  = grib_arguments_get_name(h, c, n++);
+    self->grid_definition              = grib_arguments_get_name(h, c, n++);
+    self->bitmap_present               = grib_arguments_get_name(h, c, n++);
+    self->values                       = grib_arguments_get_name(h, c, n++);
+
+    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
+    a->flags |= GRIB_ACCESSOR_FLAG_HIDDEN;
+    a->length = 0;
+}
+
+int grib_accessor_class_gds_is_present_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_gds_is_present_t* self = (grib_accessor_gds_is_present_t*)a;
+    long missing    = 255;
+    int ret         = 0;
+    size_t size     = 0;
+    double* values  = NULL;
+    grib_context* c = a->context;
+    grib_handle* h  = grib_handle_of_accessor(a);
+
+    if (*val != 1)
+        return GRIB_NOT_IMPLEMENTED;
+
+    if ((ret = grib_get_size(h, self->values, &size)) != GRIB_SUCCESS)
+        return ret;
+
+    values = (double*)grib_context_malloc(c, size * sizeof(double));
+    if (!values)
+        return GRIB_OUT_OF_MEMORY;
+
+    if ((ret = grib_get_double_array_internal(h, self->values, values, &size)) != GRIB_SUCCESS) {
+        grib_context_free(c, values);
+        return ret;
+    }
+
+    if ((ret = grib_set_long_internal(h, self->gds_present, *val)) != GRIB_SUCCESS)
+        return ret;
+
+    if ((ret = grib_set_long_internal(h, self->bitmap_present, *val)) != GRIB_SUCCESS)
+        return ret;
+
+
+    if ((ret = grib_set_long_internal(h, self->grid_definition, missing)) != GRIB_SUCCESS)
+        return ret;
+
+    if ((ret = grib_set_double_array_internal(h, self->values, values, size)) != GRIB_SUCCESS)
+        return ret;
+
+    grib_context_free(c, values);
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_gds_is_present_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    int ret                            = 0;
+    grib_handle* h                     = grib_handle_of_accessor(a);
+    grib_accessor_gds_is_present_t* self = (grib_accessor_gds_is_present_t*)a;
+
+    if ((ret = grib_get_long_internal(h, self->gds_present, val)) != GRIB_SUCCESS)
+        return ret;
+
+    *len = 1;
+
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_gds_is_present.h b/src/accessor/grib_accessor_class_gds_is_present.h
new file mode 100644
index 000000000..fa1c5ca55
--- /dev/null
+++ b/src/accessor/grib_accessor_class_gds_is_present.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_gds_is_present_h
+#define eccodes_accessor_gds_is_present_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_gds_is_present_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in gds_is_present */
+    const char* gds_present;
+    const char* grid_definition;
+    const char* bitmap_present;
+    const char* values;
+};
+
+class grib_accessor_class_gds_is_present_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_gds_is_present_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_gds_is_present_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_gds_is_present_h */
diff --git a/src/accessor/grib_accessor_class_gds_not_present_bitmap.cc b/src/accessor/grib_accessor_class_gds_not_present_bitmap.cc
new file mode 100644
index 000000000..368f112d4
--- /dev/null
+++ b/src/accessor/grib_accessor_class_gds_not_present_bitmap.cc
@@ -0,0 +1,109 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_gds_not_present_bitmap.h"
+
+grib_accessor_class_gds_not_present_bitmap_t _grib_accessor_class_gds_not_present_bitmap{"gds_not_present_bitmap"};
+grib_accessor_class* grib_accessor_class_gds_not_present_bitmap = &_grib_accessor_class_gds_not_present_bitmap;
+
+
+void grib_accessor_class_gds_not_present_bitmap_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    int n                                      = 0;
+    grib_accessor_gds_not_present_bitmap_t* self = (grib_accessor_gds_not_present_bitmap_t*)a;
+    grib_handle* hand = grib_handle_of_accessor(a);
+
+    self->missing_value           = grib_arguments_get_name(hand, args, n++);
+    self->number_of_values        = grib_arguments_get_name(hand, args, n++);
+    self->number_of_points        = grib_arguments_get_name(hand, args, n++);
+    self->latitude_of_first_point = grib_arguments_get_name(hand, args, n++);
+    self->ni                      = grib_arguments_get_name(hand, args, n++);
+    a->length                     = 0;
+}
+
+int grib_accessor_class_gds_not_present_bitmap_t::value_count(grib_accessor* a, long* number_of_points){
+    grib_accessor_gds_not_present_bitmap_t* self = (grib_accessor_gds_not_present_bitmap_t*)a;
+    *number_of_points = 0;
+    return grib_get_long_internal(grib_handle_of_accessor(a), self->number_of_points, number_of_points);
+}
+
+int grib_accessor_class_gds_not_present_bitmap_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_gds_not_present_bitmap_t* self = (grib_accessor_gds_not_present_bitmap_t*)a;
+    grib_handle* hand = grib_handle_of_accessor(a);
+
+    long number_of_points = 0, number_of_values = 0, ni = 0;
+    long latitude_of_first_point = 0;
+    size_t i                     = 0;
+    size_t n_vals                = 0;
+    long nn                      = 0;
+    long missing_value;
+
+    int err            = 0;
+    double* coded_vals = NULL;
+    err                = a->value_count(&nn);    n_vals             = nn;
+    if (err)
+        return err;
+
+    if ((err = grib_get_long(hand, self->number_of_points, &number_of_points)) != GRIB_SUCCESS)
+        return err;
+
+    if ((err = grib_get_long(hand, self->number_of_values, &number_of_values)) != GRIB_SUCCESS)
+        return err;
+
+    if ((err = grib_get_long(hand, self->latitude_of_first_point, &latitude_of_first_point)) != GRIB_SUCCESS)
+        return err;
+
+    if ((err = grib_get_long(hand, self->missing_value, &missing_value)) != GRIB_SUCCESS)
+        return err;
+
+    if ((err = grib_get_long(hand, self->ni, &ni)) != GRIB_SUCCESS)
+        return err;
+
+    if (*len < number_of_points) {
+        *len = n_vals;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    if (number_of_values > 0) {
+        coded_vals = (double*)grib_context_malloc(a->context, number_of_values * sizeof(double));
+
+        if (coded_vals == NULL)
+            return GRIB_OUT_OF_MEMORY;
+    }
+
+    if (latitude_of_first_point == 0) {
+        for (i = 0; i < number_of_values; i++)
+            val[i] = 1;
+        for (i = number_of_values; i < number_of_points; i++)
+            val[i] = 0;
+    }
+    else {
+        for (i = 0; i < ni - 1; i++)
+            val[i] = 0;
+        for (i = ni - 1; i < number_of_points; i++)
+            val[i] = 1;
+    }
+
+    *len = number_of_points;
+
+    grib_context_free(a->context, coded_vals);
+    return err;
+}
+
+int grib_accessor_class_gds_not_present_bitmap_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    // See deprecated/grib_accessor_class_gds_not_present_bitmap.cc for
+    // a possible implementation
+    return GRIB_NOT_IMPLEMENTED;
+}
+
+int grib_accessor_class_gds_not_present_bitmap_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_DOUBLE;
+}
diff --git a/src/accessor/grib_accessor_class_gds_not_present_bitmap.h b/src/accessor/grib_accessor_class_gds_not_present_bitmap.h
new file mode 100644
index 000000000..68641a8e2
--- /dev/null
+++ b/src/accessor/grib_accessor_class_gds_not_present_bitmap.h
@@ -0,0 +1,40 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_gds_not_present_bitmap_h
+#define eccodes_accessor_gds_not_present_bitmap_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_gds_not_present_bitmap_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in gds_not_present_bitmap */
+    const char*  missing_value;
+    const char*  number_of_values;
+    const char*  number_of_points;
+    const char*  latitude_of_first_point;
+    const char*  ni;
+};
+
+class grib_accessor_class_gds_not_present_bitmap_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_gds_not_present_bitmap_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_gds_not_present_bitmap_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_gds_not_present_bitmap_h */
diff --git a/src/accessor/grib_accessor_class_getenv.cc b/src/accessor/grib_accessor_class_getenv.cc
new file mode 100644
index 000000000..2c714767d
--- /dev/null
+++ b/src/accessor/grib_accessor_class_getenv.cc
@@ -0,0 +1,62 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_getenv.h"
+
+grib_accessor_class_getenv_t _grib_accessor_class_getenv{"getenv"};
+grib_accessor_class* grib_accessor_class_getenv = &_grib_accessor_class_getenv;
+
+
+void grib_accessor_class_getenv_t::init(grib_accessor* a, const long l, grib_arguments* args){
+    grib_accessor_getenv_t* self = (grib_accessor_getenv_t*)a;
+    static char undefined[]    = "undefined";
+
+    self->name          = grib_arguments_get_string(grib_handle_of_accessor(a), args, 0);
+    self->default_value = grib_arguments_get_string(grib_handle_of_accessor(a), args, 1);
+    if (!self->default_value)
+        self->default_value = undefined;
+    self->value = 0;
+}
+
+int grib_accessor_class_getenv_t::pack_string(grib_accessor* a, const char* val, size_t* len){
+    return GRIB_NOT_IMPLEMENTED;
+}
+
+int grib_accessor_class_getenv_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    grib_accessor_getenv_t* self = (grib_accessor_getenv_t*)a;
+    char* v                    = 0;
+    size_t l                   = 0;
+
+    if (!self->value) {
+        v = getenv(self->name);
+        if (!v)
+            v = (char*)self->default_value;
+        self->value = v;
+    }
+
+    l = strlen(self->value);
+    if (*len < l)
+        return GRIB_BUFFER_TOO_SMALL;
+    snprintf(val, 1024, "%s", self->value);
+    *len = strlen(self->value);
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_getenv_t::value_count(grib_accessor* a, long* count){
+    *count = 1;
+    return 0;
+}
+
+size_t grib_accessor_class_getenv_t::string_length(grib_accessor* a){
+    return 1024;
+}
diff --git a/src/accessor/grib_accessor_class_getenv.h b/src/accessor/grib_accessor_class_getenv.h
new file mode 100644
index 000000000..8ddf7db14
--- /dev/null
+++ b/src/accessor/grib_accessor_class_getenv.h
@@ -0,0 +1,38 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_getenv_h
+#define eccodes_accessor_getenv_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_ascii.h"
+
+class grib_accessor_getenv_t : public grib_accessor_ascii_t
+{
+public:
+    /* Members defined in getenv */
+    const char* name;
+    char* value;
+    const char* default_value;
+};
+
+class grib_accessor_class_getenv_t : public grib_accessor_class_ascii_t
+{
+public:
+    grib_accessor_class_getenv_t(const char* name) : grib_accessor_class_ascii_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_getenv_t{}; }
+    int pack_string(grib_accessor*, const char*, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    size_t string_length(grib_accessor*) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_getenv_h */
diff --git a/src/accessor/todo/grib_accessor_class_global_gaussian.cc b/src/accessor/grib_accessor_class_global_gaussian.cc
similarity index 64%
rename from src/accessor/todo/grib_accessor_class_global_gaussian.cc
rename to src/accessor/grib_accessor_class_global_gaussian.cc
index b39677da2..a26b77252 100644
--- a/src/accessor/todo/grib_accessor_class_global_gaussian.cc
+++ b/src/accessor/grib_accessor_class_global_gaussian.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,121 +10,14 @@
  */
 
 #include "grib_api_internal.h"
+#include "grib_accessor_class_global_gaussian.h"
 
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long;pack_long
-   IMPLEMENTS = init
-   MEMBERS=const char*                  N
-   MEMBERS=const char*                  Ni
-   MEMBERS=const char*                  di
-   MEMBERS=const char*                  latfirst
-   MEMBERS=const char*                  lonfirst
-   MEMBERS=const char*                  latlast
-   MEMBERS=const char*                  lonlast
-   MEMBERS=const char*                  plpresent
-   MEMBERS=const char*                  pl
-   MEMBERS=const char*                  basic_angle
-   MEMBERS=const char*                  subdivision
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_global_gaussian
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in global_gaussian */
-    const char*                  N;
-    const char*                  Ni;
-    const char*                  di;
-    const char*                  latfirst;
-    const char*                  lonfirst;
-    const char*                  latlast;
-    const char*                  lonlast;
-    const char*                  plpresent;
-    const char*                  pl;
-    const char*                  basic_angle;
-    const char*                  subdivision;
-} grib_accessor_global_gaussian;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_global_gaussian = {
-    &grib_accessor_class_long,                      /* super */
-    "global_gaussian",                      /* name */
-    sizeof(grib_accessor_global_gaussian),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
+grib_accessor_class_global_gaussian_t _grib_accessor_class_global_gaussian{"global_gaussian"};
 grib_accessor_class* grib_accessor_class_global_gaussian = &_grib_accessor_class_global_gaussian;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_global_gaussian* self = (grib_accessor_global_gaussian*)a;
+void grib_accessor_class_global_gaussian_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_global_gaussian_t* self = (grib_accessor_global_gaussian_t*)a;
     int n                               = 0;
     grib_handle* h                      = grib_handle_of_accessor(a);
 
@@ -140,9 +34,8 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
     self->subdivision = grib_arguments_get_name(h, c, n++);
 }
 
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_global_gaussian* self = (grib_accessor_global_gaussian*)a;
+int grib_accessor_class_global_gaussian_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_global_gaussian_t* self = (grib_accessor_global_gaussian_t*)a;
     int ret                             = GRIB_SUCCESS;
     long latfirst, latlast, lonfirst, lonlast, basic_angle, subdivision, N, Ni;
     double dlatfirst, dlatlast, dlonfirst, dlonlast;
@@ -247,9 +140,8 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
     return ret;
 }
 
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_global_gaussian* self = (grib_accessor_global_gaussian*)a;
+int grib_accessor_class_global_gaussian_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_global_gaussian_t* self = (grib_accessor_global_gaussian_t*)a;
     int ret                             = GRIB_SUCCESS;
     long latfirst, latlast, lonfirst, lonlast, di, diold, basic_angle = 0, N, Ni;
     long factor;
diff --git a/src/accessor/grib_accessor_class_global_gaussian.h b/src/accessor/grib_accessor_class_global_gaussian.h
new file mode 100644
index 000000000..f1e8bf53b
--- /dev/null
+++ b/src/accessor/grib_accessor_class_global_gaussian.h
@@ -0,0 +1,44 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_global_gaussian_h
+#define eccodes_accessor_global_gaussian_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_global_gaussian_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in global_gaussian */
+    const char*                  N;
+    const char*                  Ni;
+    const char*                  di;
+    const char*                  latfirst;
+    const char*                  lonfirst;
+    const char*                  latlast;
+    const char*                  lonlast;
+    const char*                  plpresent;
+    const char*                  pl;
+    const char*                  basic_angle;
+    const char*                  subdivision;
+};
+
+class grib_accessor_class_global_gaussian_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_global_gaussian_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_global_gaussian_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_global_gaussian_h */
diff --git a/src/accessor/grib_accessor_class_group.cc b/src/accessor/grib_accessor_class_group.cc
new file mode 100644
index 000000000..20ca66ae2
--- /dev/null
+++ b/src/accessor/grib_accessor_class_group.cc
@@ -0,0 +1,160 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_group.h"
+
+grib_accessor_class_group_t _grib_accessor_class_group{"group"};
+grib_accessor_class* grib_accessor_class_group = &_grib_accessor_class_group;
+
+
+void grib_accessor_class_group_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    grib_buffer* buffer       = grib_handle_of_accessor(a)->buffer;
+    grib_accessor_group_t* self = (grib_accessor_group_t*)a;
+
+    size_t i = 0;
+    unsigned char* v;
+    const char* s = grib_arguments_get_string(grib_handle_of_accessor(a), arg, 0);
+
+    if (s && strlen(s) > 1) {
+        grib_context_log(a->context, GRIB_LOG_WARNING,
+                         "Using only first character as group end of %s not the string %s", a->name, s);
+    }
+
+    self->endCharacter = s ? s[0] : 0;
+
+    v = buffer->data + a->offset;
+    i = 0;
+    if (s) {
+        while (*v != self->endCharacter && i <= buffer->ulength) {
+            if (*v > 126)
+                *v = 32;
+            v++;
+            i++;
+        }
+    }
+    else {
+        while (*v > 32 && *v != 61 && *v < 127 && i <= buffer->ulength) {
+            v++;
+            i++;
+        }
+    }
+    a->length = i;
+
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+}
+
+int grib_accessor_class_group_t::value_count(grib_accessor* a, long* count){
+    *count = 1;
+    return 0;
+}
+
+size_t grib_accessor_class_group_t::string_length(grib_accessor* a){
+    return a->length;
+}
+
+void grib_accessor_class_group_t::dump(grib_accessor* a, grib_dumper* dumper){
+    grib_dump_string(dumper, a, NULL);
+}
+
+int grib_accessor_class_group_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_STRING;
+}
+
+int grib_accessor_class_group_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    long i = 0;
+    size_t l = a->length + 1;
+    grib_handle* h = grib_handle_of_accessor(a);
+
+    if (*len < l) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
+                         a->cclass->name, a->name, l, *len);
+        *len = l;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    for (i = 0; i < a->length; i++)
+        val[i] = h->buffer->data[a->offset + i];
+    val[i] = 0;
+    *len = i;
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_group_t::unpack_long(grib_accessor* a, long* v, size_t* len){
+    char val[1024] = {0,};
+    size_t l   = sizeof(val);
+    size_t i   = 0;
+    char* last = NULL;
+    int err    = a->unpack_string(val, &l);
+    if (err)
+        return err;
+
+    i = 0;
+    while (i < l - 1 && val[i] == ' ')
+        i++;
+
+    if (val[i] == 0) {
+        *v = 0;
+        return 0;
+    }
+    if (val[i + 1] == ' ' && i < l - 2)
+        val[i + 1] = 0;
+
+    *v = strtol(val, &last, 10);
+
+    grib_context_log(a->context, GRIB_LOG_DEBUG, " Casting string %s to long", a->name);
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_group_t::unpack_double(grib_accessor* a, double* v, size_t* len){
+    char val[1024];
+    size_t l   = sizeof(val);
+    char* last = NULL;
+    a->unpack_string(val, &l);
+    *v = strtod(val, &last);
+
+    if (*last == 0) {
+        grib_context_log(a->context, GRIB_LOG_DEBUG, " Casting string %s to long", a->name);
+        return GRIB_SUCCESS;
+    }
+
+    return GRIB_NOT_IMPLEMENTED;
+}
+
+int grib_accessor_class_group_t::compare(grib_accessor* a, grib_accessor* b){
+    grib_context_log(a->context, GRIB_LOG_ERROR, "%s:%s not implemented", __func__, a->name);
+    return GRIB_NOT_IMPLEMENTED;
+
+    // int retval = 0;
+    // char* aval = 0;
+    // char* bval = 0;
+    // int err    = 0;
+    // size_t alen = 0;
+    // size_t blen = 0;
+    // long count  = 0;
+    // err = a->value_count(&count);    // if (err) return err;
+    // alen = count;
+    // err = b->value_count(&count);    // if (err) return err;
+    // blen = count;
+    // if (alen != blen) return GRIB_COUNT_MISMATCH;
+    // aval = (char*)grib_context_malloc(a->context, alen * sizeof(char));
+    // bval = (char*)grib_context_malloc(b->context, blen * sizeof(char));
+    // a->unpack_string(aval, &alen);    // b->unpack_string(bval, &blen);    // retval = GRIB_SUCCESS;
+    // if (strcmp(aval, bval)) retval = GRIB_STRING_VALUE_MISMATCH;
+    // grib_context_free(a->context, aval);
+    // grib_context_free(b->context, bval);
+    // return retval;
+}
+
+long grib_accessor_class_group_t::next_offset(grib_accessor* a){
+    return a->offset + a->length;
+}
diff --git a/src/accessor/grib_accessor_class_group.h b/src/accessor/grib_accessor_class_group.h
new file mode 100644
index 000000000..085b91a8a
--- /dev/null
+++ b/src/accessor/grib_accessor_class_group.h
@@ -0,0 +1,41 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_group_h
+#define eccodes_accessor_group_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_group_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in group */
+    char endCharacter;
+};
+
+class grib_accessor_class_group_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_group_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_group_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    size_t string_length(grib_accessor*) override;
+    long next_offset(grib_accessor*) override;
+    int value_count(grib_accessor*, long*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    int compare(grib_accessor*, grib_accessor*) override;
+};
+#endif /* eccodes_accessor_group_h */
diff --git a/src/accessor/grib_accessor_class_gts_header.cc b/src/accessor/grib_accessor_class_gts_header.cc
new file mode 100644
index 000000000..4d24c8835
--- /dev/null
+++ b/src/accessor/grib_accessor_class_gts_header.cc
@@ -0,0 +1,61 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_gts_header.h"
+
+grib_accessor_class_gts_header_t _grib_accessor_class_gts_header{"gts_header"};
+grib_accessor_class* grib_accessor_class_gts_header = &_grib_accessor_class_gts_header;
+
+
+void grib_accessor_class_gts_header_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_gts_header_t* self = (grib_accessor_gts_header_t*)a;
+    self->gts_offset = -1;
+    self->gts_length = -1;
+    self->gts_offset = grib_arguments_get_long(grib_handle_of_accessor(a), c, 0);
+    self->gts_length = grib_arguments_get_long(grib_handle_of_accessor(a), c, 1);
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+}
+
+int grib_accessor_class_gts_header_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    grib_accessor_gts_header_t* self = (grib_accessor_gts_header_t*)a;
+    grib_handle* h                 = grib_handle_of_accessor(a);
+    int offset                     = 0;
+    size_t length                  = 0;
+
+    if (h->gts_header == NULL || h->gts_header_len < 8) {
+        if (*len < 8)
+            return GRIB_BUFFER_TOO_SMALL;
+        snprintf(val, 1024, "missing");
+        return GRIB_SUCCESS;
+    }
+    if (*len < h->gts_header_len)
+        return GRIB_BUFFER_TOO_SMALL;
+
+    offset = self->gts_offset > 0 ? self->gts_offset : 0;
+    length = self->gts_length > 0 ? self->gts_length : h->gts_header_len;
+
+    memcpy(val, h->gts_header + offset, length);
+
+    *len = length;
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_gts_header_t::value_count(grib_accessor* a, long* count){
+    *count = 1;
+    return 0;
+}
+
+size_t grib_accessor_class_gts_header_t::string_length(grib_accessor* a){
+    grib_handle* h = grib_handle_of_accessor(a);
+    return h->gts_header_len;
+}
diff --git a/src/accessor/grib_accessor_class_gts_header.h b/src/accessor/grib_accessor_class_gts_header.h
new file mode 100644
index 000000000..c164a9df9
--- /dev/null
+++ b/src/accessor/grib_accessor_class_gts_header.h
@@ -0,0 +1,36 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_gts_header_h
+#define eccodes_accessor_gts_header_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_ascii.h"
+
+class grib_accessor_gts_header_t : public grib_accessor_ascii_t
+{
+public:
+    /* Members defined in gts_header */
+    int gts_offset;
+    int gts_length;
+};
+
+class grib_accessor_class_gts_header_t : public grib_accessor_class_ascii_t
+{
+public:
+    grib_accessor_class_gts_header_t(const char* name) : grib_accessor_class_ascii_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_gts_header_t{}; }
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    size_t string_length(grib_accessor*) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_gts_header_h */
diff --git a/src/accessor/grib_accessor_class_hash_array.cc b/src/accessor/grib_accessor_class_hash_array.cc
new file mode 100644
index 000000000..d2fd1a8ef
--- /dev/null
+++ b/src/accessor/grib_accessor_class_hash_array.cc
@@ -0,0 +1,176 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_hash_array.h"
+
+grib_accessor_class_hash_array_t _grib_accessor_class_hash_array{"hash_array"};
+grib_accessor_class* grib_accessor_class_hash_array = &_grib_accessor_class_hash_array;
+
+
+#define MAX_HASH_ARRAY_STRING_LENGTH 255
+
+void grib_accessor_class_hash_array_t::init(grib_accessor* a, const long len, grib_arguments* args){
+    grib_accessor_hash_array_t* self = (grib_accessor_hash_array_t*)a;
+    a->length                      = 0;
+    self->key                      = 0;
+    self->ha                       = NULL;
+}
+
+void grib_accessor_class_hash_array_t::dump(grib_accessor* a, grib_dumper* dumper){
+    grib_dump_string(dumper, a, NULL);
+}
+
+int grib_accessor_class_hash_array_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_hash_array_t* self = (grib_accessor_hash_array_t*)a;
+    char s[200]                    = {0,};
+    snprintf(s, sizeof(s), "%g", *val);
+    self->key = grib_context_strdup(a->context, s);
+    self->ha  = 0;
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_hash_array_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_hash_array_t* self = (grib_accessor_hash_array_t*)a;
+    char s[200]                    = {0,};
+    snprintf(s, sizeof(s), "%ld", *val);
+    if (self->key)
+        grib_context_free(a->context, self->key);
+    self->key = grib_context_strdup(a->context, s);
+    self->ha  = 0;
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_hash_array_t::pack_string(grib_accessor* a, const char* v, size_t* len){
+    grib_accessor_hash_array_t* self = (grib_accessor_hash_array_t*)a;
+    self->key                      = grib_context_strdup(a->context, v);
+    self->ha                       = 0;
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_hash_array_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    return GRIB_NOT_IMPLEMENTED;
+}
+
+static grib_hash_array_value* find_hash_value(grib_accessor* a, int* err)
+{
+    grib_accessor_hash_array_t* self = (grib_accessor_hash_array_t*)a;
+    grib_hash_array_value* ha_ret  = 0;
+    grib_hash_array_value* ha      = NULL;
+
+    ha = get_hash_array(grib_handle_of_accessor(a), a->creator);
+    if (!ha) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "unable to get hash value for %s", a->creator->name);
+        *err = GRIB_HASH_ARRAY_NO_MATCH;
+        return NULL;
+    }
+
+    *err = GRIB_SUCCESS;
+
+    Assert(ha != NULL);
+    if (!self->key) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "unable to get hash value for %s, set before getting", a->creator->name);
+        *err = GRIB_HASH_ARRAY_NO_MATCH;
+        return NULL;
+    }
+
+    ha_ret = (grib_hash_array_value*)grib_trie_get(ha->index, self->key);
+    if (!ha_ret)
+        ha_ret = (grib_hash_array_value*)grib_trie_get(ha->index, "default");
+
+    if (!ha_ret) {
+        *err = GRIB_HASH_ARRAY_NO_MATCH;
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "hash_array: no match for %s=%s",
+                         a->creator->name, self->key);
+        const char* full_path = get_hash_array_full_path(a->creator);
+        if (full_path) {
+            grib_context_log(a->context, GRIB_LOG_ERROR, "hash_array: file path = %s", full_path);
+        }
+        grib_context_log(a->context, GRIB_LOG_ERROR, "Hint: Check the key 'masterTablesVersionNumber'");
+        return NULL;
+    }
+    return ha_ret;
+}
+
+int grib_accessor_class_hash_array_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_hash_array_value* ha = 0;
+    grib_accessor_hash_array_t* self = (grib_accessor_hash_array_t*)a;
+    int err = 0;
+    size_t i = 0;
+
+    if (!self->ha) {
+        ha = find_hash_value(a, &err);
+        if (err)
+            return err;
+        self->ha = ha;
+    }
+
+    switch (self->ha->type) {
+        case GRIB_HASH_ARRAY_TYPE_INTEGER:
+            if (*len < self->ha->iarray->n) {
+                return GRIB_ARRAY_TOO_SMALL;
+            }
+            *len = self->ha->iarray->n;
+            for (i = 0; i < *len; i++)
+                val[i] = self->ha->iarray->v[i];
+            break;
+
+        default:
+            return GRIB_NOT_IMPLEMENTED;
+    }
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_hash_array_t::get_native_type(grib_accessor* a){
+    int type = GRIB_TYPE_STRING;
+    if (a->flags & GRIB_ACCESSOR_FLAG_LONG_TYPE)
+        type = GRIB_TYPE_LONG;
+
+    return type;
+}
+
+void grib_accessor_class_hash_array_t::destroy(grib_context* c, grib_accessor* a){
+    grib_accessor_hash_array_t* self = (grib_accessor_hash_array_t*)a;
+    if (self->key)
+        grib_context_free(c, self->key);
+}
+
+int grib_accessor_class_hash_array_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    return GRIB_NOT_IMPLEMENTED;
+}
+
+size_t grib_accessor_class_hash_array_t::string_length(grib_accessor* a){
+    return MAX_HASH_ARRAY_STRING_LENGTH;
+}
+
+int grib_accessor_class_hash_array_t::value_count(grib_accessor* a, long* count){
+    int err                        = 0;
+    grib_accessor_hash_array_t* self = (grib_accessor_hash_array_t*)a;
+    grib_hash_array_value* ha      = 0;
+
+    if (!self->ha) {
+        ha = find_hash_value(a, &err);
+        if (err)
+            return err;
+        self->ha = ha;
+    }
+
+    *count = self->ha->iarray->n;
+    return err;
+}
+
+int grib_accessor_class_hash_array_t::compare(grib_accessor* a, grib_accessor* b){
+    return GRIB_NOT_IMPLEMENTED;
+}
diff --git a/src/accessor/grib_accessor_class_hash_array.h b/src/accessor/grib_accessor_class_hash_array.h
new file mode 100644
index 000000000..78856c7e7
--- /dev/null
+++ b/src/accessor/grib_accessor_class_hash_array.h
@@ -0,0 +1,45 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_hash_array_h
+#define eccodes_accessor_hash_array_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_hash_array_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in hash_array */
+    char* key;
+    grib_hash_array_value* ha;
+};
+
+class grib_accessor_class_hash_array_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_hash_array_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_hash_array_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int pack_string(grib_accessor*, const char*, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    size_t string_length(grib_accessor*) override;
+    int value_count(grib_accessor*, long*) override;
+    void destroy(grib_context*, grib_accessor*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    int compare(grib_accessor*, grib_accessor*) override;
+};
+#endif /* eccodes_accessor_hash_array_h */
diff --git a/src/accessor/grib_accessor_class_headers_only.cc b/src/accessor/grib_accessor_class_headers_only.cc
new file mode 100644
index 000000000..b1c00a529
--- /dev/null
+++ b/src/accessor/grib_accessor_class_headers_only.cc
@@ -0,0 +1,33 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_headers_only.h"
+
+grib_accessor_class_headers_only_t _grib_accessor_class_headers_only{"headers_only"};
+grib_accessor_class* grib_accessor_class_headers_only = &_grib_accessor_class_headers_only;
+
+
+void grib_accessor_class_headers_only_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->flags |= GRIB_ACCESSOR_FLAG_HIDDEN;
+    a->length = 0;
+}
+
+int grib_accessor_class_headers_only_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    *val = grib_handle_of_accessor(a)->partial;
+    *len = 1;
+    return 0;
+}
+
+int grib_accessor_class_headers_only_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_LONG;
+}
diff --git a/src/accessor/grib_accessor_class_headers_only.h b/src/accessor/grib_accessor_class_headers_only.h
new file mode 100644
index 000000000..29d7e8bf5
--- /dev/null
+++ b/src/accessor/grib_accessor_class_headers_only.h
@@ -0,0 +1,33 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_headers_only_h
+#define eccodes_accessor_headers_only_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_headers_only_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in headers_only */
+};
+
+class grib_accessor_class_headers_only_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_headers_only_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_headers_only_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_headers_only_h */
diff --git a/src/accessor/grib_accessor_class_ibmfloat.cc b/src/accessor/grib_accessor_class_ibmfloat.cc
new file mode 100644
index 000000000..4528c0807
--- /dev/null
+++ b/src/accessor/grib_accessor_class_ibmfloat.cc
@@ -0,0 +1,150 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_ibmfloat.h"
+
+grib_accessor_class_ibmfloat_t _grib_accessor_class_ibmfloat{"ibmfloat"};
+grib_accessor_class* grib_accessor_class_ibmfloat = &_grib_accessor_class_ibmfloat;
+
+
+void grib_accessor_class_ibmfloat_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    grib_accessor_ibmfloat_t* self = (grib_accessor_ibmfloat_t*)a;
+    long count = 0;
+
+    self->arg = arg;
+    a->value_count(&count);    a->length = 4 * count;
+    Assert(a->length >= 0);
+}
+
+template <typename T>
+int unpack(grib_accessor* a, T* val, size_t* len){
+    static_assert(std::is_floating_point<T>::value, "Requires floating point numbers");
+    unsigned long rlen = 0;
+    long count         = 0;
+    int err            = 0;
+    unsigned long i    = 0;
+    long bitp          = a->offset * 8;
+    grib_handle* hand  = grib_handle_of_accessor(a);
+
+    err = a->value_count(&count);    if (err)
+        return err;
+    rlen = count;
+
+    if (*len < rlen) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size (%zu) for %s, it contains %lu values", *len, a->name, rlen);
+        *len = 0;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    for (i = 0; i < rlen; i++)
+        val[i] = (T)grib_long_to_ibm(grib_decode_unsigned_long(hand->buffer->data, &bitp, 32));
+
+    *len = rlen;
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_ibmfloat_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    return unpack<double>(a, val, len);
+}
+
+int grib_accessor_class_ibmfloat_t::unpack_float(grib_accessor* a, float* val, size_t* len){
+    return unpack<float>(a, val, len);
+}
+
+int grib_accessor_class_ibmfloat_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_ibmfloat_t* self = (grib_accessor_ibmfloat_t*)a;
+    int ret                      = 0;
+    unsigned long i              = 0;
+    unsigned long rlen           = *len;
+    size_t buflen                = 0;
+    unsigned char* buf           = NULL;
+    long off                     = 0;
+
+    if (*len < 1) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s, it packs at least 1 value", a->name);
+        *len = 0;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    if (rlen == 1) {
+
+        //double x = 0;
+        //grib_nearest_smaller_ibm_float(val[0],&x);
+        //double y = grib_long_to_ibm(grib_ibm_to_long(val[0]));
+        //printf("IBMFLOAT val=%.20f nearest_smaller_ibm_float=%.20f long_to_ibm=%.20f\n",val[0],x ,y);
+
+        off = byte_offset(a) * 8;
+        ret = grib_encode_unsigned_long(grib_handle_of_accessor(a)->buffer->data, grib_ibm_to_long(val[0]), &off, 32);
+        if (*len > 1)
+            grib_context_log(a->context, GRIB_LOG_WARNING, "ibmfloat: Trying to pack %zu values in a scalar %s, packing first value",
+                             *len, a->name);
+        if (ret == GRIB_SUCCESS)
+            len[0] = 1;
+        return ret;
+    }
+
+    buflen = rlen * 4;
+
+    buf = (unsigned char*)grib_context_malloc(a->context, buflen);
+
+    for (i = 0; i < rlen; i++) {
+        grib_encode_unsigned_longb(buf, grib_ibm_to_long(val[i]), &off, 32);
+    }
+    ret = grib_set_long_internal(grib_handle_of_accessor(a), grib_arguments_get_name(a->parent->h, self->arg, 0), rlen);
+
+    if (ret == GRIB_SUCCESS)
+        grib_buffer_replace(a, buf, buflen, 1, 1);
+    else
+        *len = 0;
+
+    grib_context_free(a->context, buf);
+
+    a->length = byte_count(a);
+
+    return ret;
+}
+
+long grib_accessor_class_ibmfloat_t::byte_count(grib_accessor* a){
+    return a->length;
+}
+
+int grib_accessor_class_ibmfloat_t::value_count(grib_accessor* a, long* len){
+    grib_accessor_ibmfloat_t* self = (grib_accessor_ibmfloat_t*)a;
+    *len = 0;
+    if (!self->arg) {
+        *len = 1;
+        return 0;
+    }
+    return grib_get_long_internal(grib_handle_of_accessor(a), grib_arguments_get_name(a->parent->h, self->arg, 0), len);
+}
+
+long grib_accessor_class_ibmfloat_t::byte_offset(grib_accessor* a){
+    return a->offset;
+}
+
+void grib_accessor_class_ibmfloat_t::update_size(grib_accessor* a, size_t s){
+    a->length = (long)s;
+    Assert(a->length >= 0);
+}
+
+long grib_accessor_class_ibmfloat_t::next_offset(grib_accessor* a){
+    return a->byte_offset() + a->byte_count();}
+
+int grib_accessor_class_ibmfloat_t::nearest_smaller_value(grib_accessor* a, double val, double* nearest){
+    int ret = 0;
+    if (grib_nearest_smaller_ibm_float(val, nearest) == GRIB_INTERNAL_ERROR) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "ibm_float:nearest_smaller_value overflow value=%g", val);
+        grib_dump_content(grib_handle_of_accessor(a), stderr, "wmo", GRIB_DUMP_FLAG_HEXADECIMAL, 0);
+        ret = GRIB_INTERNAL_ERROR;
+    }
+    return ret;
+}
diff --git a/src/accessor/grib_accessor_class_ibmfloat.h b/src/accessor/grib_accessor_class_ibmfloat.h
new file mode 100644
index 000000000..4a82dda63
--- /dev/null
+++ b/src/accessor/grib_accessor_class_ibmfloat.h
@@ -0,0 +1,40 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_ibmfloat_h
+#define eccodes_accessor_ibmfloat_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_double.h"
+
+class grib_accessor_ibmfloat_t : public grib_accessor_double_t
+{
+public:
+    /* Members defined in ibmfloat */
+    grib_arguments* arg;
+};
+
+class grib_accessor_class_ibmfloat_t : public grib_accessor_class_double_t
+{
+public:
+    grib_accessor_class_ibmfloat_t(const char* name) : grib_accessor_class_double_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_ibmfloat_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_float(grib_accessor*, float* val, size_t* len) override;
+    long byte_count(grib_accessor*) override;
+    long byte_offset(grib_accessor*) override;
+    long next_offset(grib_accessor*) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    void update_size(grib_accessor*, size_t) override;
+    int nearest_smaller_value(grib_accessor*, double, double*) override;
+};
+#endif /* eccodes_accessor_ibmfloat_h */
diff --git a/src/accessor/grib_accessor_class_ieeefloat.cc b/src/accessor/grib_accessor_class_ieeefloat.cc
new file mode 100644
index 000000000..1433bd8d5
--- /dev/null
+++ b/src/accessor/grib_accessor_class_ieeefloat.cc
@@ -0,0 +1,123 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_ieeefloat.h"
+
+grib_accessor_class_ieeefloat_t _grib_accessor_class_ieeefloat{"ieeefloat"};
+grib_accessor_class* grib_accessor_class_ieeefloat = &_grib_accessor_class_ieeefloat;
+
+
+void grib_accessor_class_ieeefloat_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    grib_accessor_ieeefloat_t* self = (grib_accessor_ieeefloat_t*)a;
+    long count                    = 0;
+    self->arg                     = arg;
+    a->value_count(&count);    a->length = 4 * count;
+    Assert(a->length >= 0);
+}
+
+int grib_accessor_class_ieeefloat_t::value_count(grib_accessor* a, long* len){
+    grib_accessor_ieeefloat_t* self = (grib_accessor_ieeefloat_t*)a;
+    *len = 0;
+
+    if (!self->arg) {
+        *len = 1;
+        return 0;
+    }
+    return grib_get_long_internal(grib_handle_of_accessor(a), grib_arguments_get_name(a->parent->h, self->arg, 0), len);
+}
+
+int grib_accessor_class_ieeefloat_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_ieeefloat_t* self = (grib_accessor_ieeefloat_t*)a;
+    int ret                       = 0;
+    unsigned long i               = 0;
+    unsigned long rlen            = (unsigned long)*len;
+    size_t buflen                 = 0;
+    unsigned char* buf            = NULL;
+    long off                      = 0;
+
+    if (*len < 1) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s, it packs at least 1 value", a->name);
+        *len = 0;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    if (rlen == 1) {
+        off = a->offset * 8;
+        ret = grib_encode_unsigned_long(grib_handle_of_accessor(a)->buffer->data, grib_ieee_to_long(val[0]), &off, 32);
+        if (*len > 1)
+            grib_context_log(a->context, GRIB_LOG_WARNING, "ieeefloat: Trying to pack %zu values in a scalar %s, packing first value",
+                            *len, a->name);
+        if (ret == GRIB_SUCCESS)
+            len[0] = 1;
+        return ret;
+    }
+
+    buflen = rlen * 4;
+
+    buf = (unsigned char*)grib_context_malloc(a->context, buflen);
+
+    for (i = 0; i < rlen; i++) {
+        grib_encode_unsigned_longb(buf, grib_ieee_to_long(val[i]), &off, 32);
+    }
+    ret = grib_set_long_internal(grib_handle_of_accessor(a), grib_arguments_get_name(a->parent->h, self->arg, 0), rlen);
+
+    if (ret == GRIB_SUCCESS)
+        grib_buffer_replace(a, buf, buflen, 1, 1);
+    else
+        *len = 0;
+
+    grib_context_free(a->context, buf);
+
+    return ret;
+}
+
+template <typename T>
+int unpack(grib_accessor* a, T* val, size_t* len){
+    static_assert(std::is_floating_point<T>::value, "Requires floating point numbers");
+    long rlen = 0;
+    int err   = 0;
+    long i    = 0;
+    long bitp = a->offset * 8;
+    grib_handle* hand  = grib_handle_of_accessor(a);
+
+    err = a->value_count(&rlen);    if (err)
+        return err;
+
+    if (*len < (size_t)rlen) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size (%zu) for %s, it contains %ld values", *len, a->name, rlen);
+        *len = 0;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    for (i = 0; i < rlen; i++)
+        val[i] = (T)grib_long_to_ieee(grib_decode_unsigned_long(hand->buffer->data, &bitp, 32));
+
+    *len = rlen;
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_ieeefloat_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    return unpack<double>(a, val, len);
+}
+
+int grib_accessor_class_ieeefloat_t::unpack_float(grib_accessor* a, float* val, size_t* len){
+    return unpack<float>(a, val, len);
+}
+
+void grib_accessor_class_ieeefloat_t::update_size(grib_accessor* a, size_t s){
+    a->length = (long)s;
+    Assert(a->length >= 0);
+}
+
+int grib_accessor_class_ieeefloat_t::nearest_smaller_value(grib_accessor* a, double val, double* nearest){
+    return grib_nearest_smaller_ieee_float(val, nearest);
+}
diff --git a/src/accessor/grib_accessor_class_ieeefloat.h b/src/accessor/grib_accessor_class_ieeefloat.h
new file mode 100644
index 000000000..b59357d72
--- /dev/null
+++ b/src/accessor/grib_accessor_class_ieeefloat.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_ieeefloat_h
+#define eccodes_accessor_ieeefloat_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_double.h"
+
+class grib_accessor_ieeefloat_t : public grib_accessor_double_t
+{
+public:
+    grib_arguments* arg;
+};
+
+class grib_accessor_class_ieeefloat_t : public grib_accessor_class_double_t
+{
+public:
+    grib_accessor_class_ieeefloat_t(const char* name) : grib_accessor_class_double_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_ieeefloat_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_float(grib_accessor*, float* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    void update_size(grib_accessor*, size_t) override;
+    int nearest_smaller_value(grib_accessor* a, double val, double* nearest) override;
+};
+#endif /* eccodes_accessor_ieeefloat_h */
diff --git a/src/accessor/grib_accessor_class_ifs_param.cc b/src/accessor/grib_accessor_class_ifs_param.cc
new file mode 100644
index 000000000..291849046
--- /dev/null
+++ b/src/accessor/grib_accessor_class_ifs_param.cc
@@ -0,0 +1,93 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_ifs_param.h"
+
+grib_accessor_class_ifs_param_t _grib_accessor_class_ifs_param{"ifs_param"};
+grib_accessor_class* grib_accessor_class_ifs_param = &_grib_accessor_class_ifs_param;
+
+
+void grib_accessor_class_ifs_param_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_ifs_param_t* self = (grib_accessor_ifs_param_t*)a;
+    int n                         = 0;
+
+    self->paramId = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->type    = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+}
+
+int grib_accessor_class_ifs_param_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_ifs_param_t* self = (grib_accessor_ifs_param_t*)a;
+    int ret                       = 0;
+    long paramId                  = 0;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->paramId, &paramId)) != GRIB_SUCCESS)
+        return ret;
+
+    if (paramId > 129000 && paramId < 129999)
+        *val = paramId - 129000;
+    else if (paramId > 200000 && paramId < 200999)
+        *val = paramId - 200000;
+    else if (paramId > 211000 && paramId < 211999)
+        *val = paramId - 1000;
+    else
+        *val = paramId;
+
+    return ret;
+}
+
+int grib_accessor_class_ifs_param_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_ifs_param_t* self = (grib_accessor_ifs_param_t*)a;
+    long type                     = 0;
+    long table                    = 128;
+    long paramId                  = *val;
+    long param;
+
+    grib_get_long(grib_handle_of_accessor(a), self->type, &type);
+
+    if (type == 33 || type == 35) {
+        if (paramId > 1000) {
+            table   = paramId / 1000;
+            param   = paramId - table * 1000;
+            paramId = param;
+        }
+        switch (table) {
+            case 210:
+                paramId += 211000;
+                break;
+            case 128:
+                paramId += 200000;
+                break;
+            default:
+                break;
+        }
+    }
+    if (type == 50 || type == 52) {
+        if (paramId > 1000) {
+            table   = paramId / 1000;
+            param   = paramId - table * 1000;
+            paramId = param;
+        }
+        switch (table) {
+            case 128:
+                paramId += 129000;
+                break;
+            default:
+                break;
+        }
+    }
+
+    return grib_set_long_internal(grib_handle_of_accessor(a), self->paramId, paramId);
+}
+
+int grib_accessor_class_ifs_param_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_LONG;
+}
diff --git a/src/accessor/grib_accessor_class_ifs_param.h b/src/accessor/grib_accessor_class_ifs_param.h
new file mode 100644
index 000000000..d41da1723
--- /dev/null
+++ b/src/accessor/grib_accessor_class_ifs_param.h
@@ -0,0 +1,36 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_ifs_param_h
+#define eccodes_accessor_ifs_param_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_ifs_param_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in ifs_param */
+    const char*    paramId;
+    const char*    type;
+};
+
+class grib_accessor_class_ifs_param_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_ifs_param_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_ifs_param_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_ifs_param_h */
diff --git a/src/accessor/todo/grib_accessor_class_julian_date.cc b/src/accessor/grib_accessor_class_julian_date.cc
similarity index 66%
rename from src/accessor/todo/grib_accessor_class_julian_date.cc
rename to src/accessor/grib_accessor_class_julian_date.cc
index 61fd6959c..966dc2d66 100644
--- a/src/accessor/todo/grib_accessor_class_julian_date.cc
+++ b/src/accessor/grib_accessor_class_julian_date.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,128 +10,15 @@
  */
 
 #include "grib_api_internal.h"
+#include "grib_accessor_class_julian_date.h"
 
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_double
-   IMPLEMENTS = unpack_double; pack_double
-   IMPLEMENTS = unpack_long; pack_long
-   IMPLEMENTS = unpack_string; pack_string
-   IMPLEMENTS = dump
-   IMPLEMENTS = init
-   IMPLEMENTS = pack_expression
-   MEMBERS    = const char *year
-   MEMBERS    = const char *month
-   MEMBERS    = const char *day
-   MEMBERS    = const char *hour
-   MEMBERS    = const char *minute
-   MEMBERS    = const char *second
-   MEMBERS    = const char *ymd
-   MEMBERS    = const char *hms
-   MEMBERS    = char sep[5]
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int pack_string(grib_accessor*, const char*, size_t* len);
-static int pack_expression(grib_accessor*, grib_expression*);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_julian_date
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in julian_date */
-    const char *year;
-    const char *month;
-    const char *day;
-    const char *hour;
-    const char *minute;
-    const char *second;
-    const char *ymd;
-    const char *hms;
-    char sep[5];
-} grib_accessor_julian_date;
-
-extern grib_accessor_class* grib_accessor_class_double;
-
-static grib_accessor_class _grib_accessor_class_julian_date = {
-    &grib_accessor_class_double,                      /* super */
-    "julian_date",                      /* name */
-    sizeof(grib_accessor_julian_date),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    &pack_string,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    &pack_expression,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
+grib_accessor_class_julian_date_t _grib_accessor_class_julian_date{"julian_date"};
 grib_accessor_class* grib_accessor_class_julian_date = &_grib_accessor_class_julian_date;
 
-/* END_CLASS_IMP */
 
 
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_julian_date* self = (grib_accessor_julian_date*)a;
+void grib_accessor_class_julian_date_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_julian_date_t* self = (grib_accessor_julian_date_t*)a;
     int n                           = 0;
     grib_handle* h                  = grib_handle_of_accessor(a);
 
@@ -163,18 +51,16 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
     a->length = 0;
 }
 
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
+void grib_accessor_class_julian_date_t::dump(grib_accessor* a, grib_dumper* dumper){
     grib_dump_string(dumper, a, NULL);
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
+int grib_accessor_class_julian_date_t::unpack_double(grib_accessor* a, double* val, size_t* len){
     int ret = 0;
     long hour, minute, second;
     long year, month, day, ymd, hms;
     grib_handle* h                  = grib_handle_of_accessor(a);
-    grib_accessor_julian_date* self = (grib_accessor_julian_date*)a;
+    grib_accessor_julian_date_t* self = (grib_accessor_julian_date_t*)a;
 
     if (self->ymd == NULL) {
         ret = grib_get_long(h, self->year, &year);
@@ -222,9 +108,8 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     return ret;
 }
 
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_julian_date* self = (grib_accessor_julian_date*)a;
+int grib_accessor_class_julian_date_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_julian_date_t* self = (grib_accessor_julian_date_t*)a;
     int ret                         = 0;
     long hour                       = 0;
     long minute                     = 0;
@@ -272,12 +157,11 @@ static int pack_double(grib_accessor* a, const double* val, size_t* len)
     return ret;
 }
 
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
+int grib_accessor_class_julian_date_t::unpack_string(grib_accessor* a, char* val, size_t* len){
     int ret = 0;
     long hour, minute, second;
     long year, month, day, ymd, hms;
-    grib_accessor_julian_date* self = (grib_accessor_julian_date*)a;
+    grib_accessor_julian_date_t* self = (grib_accessor_julian_date_t*)a;
     char* sep                       = self->sep;
     grib_handle* h                  = grib_handle_of_accessor(a);
 
@@ -338,12 +222,11 @@ static int unpack_string(grib_accessor* a, char* val, size_t* len)
     return ret;
 }
 
-static int pack_string(grib_accessor* a, const char* val, size_t* len)
-{
+int grib_accessor_class_julian_date_t::pack_string(grib_accessor* a, const char* val, size_t* len){
     int ret = 0;
     long hour, minute, second;
     long year, month, day, ymd, hms;
-    grib_accessor_julian_date* self = (grib_accessor_julian_date*)a;
+    grib_accessor_julian_date_t* self = (grib_accessor_julian_date_t*)a;
     char* sep                       = self->sep;
     grib_handle* h                  = grib_handle_of_accessor(a);
 
@@ -409,19 +292,16 @@ static int pack_string(grib_accessor* a, const char* val, size_t* len)
     return ret;
 }
 
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
+int grib_accessor_class_julian_date_t::unpack_long(grib_accessor* a, long* val, size_t* len){
     grib_context_log(a->context, GRIB_LOG_ERROR, " Cannot unpack %s as long", a->name);
     return GRIB_NOT_IMPLEMENTED;
 }
-static int pack_long(grib_accessor* a, const long* v, size_t* len)
-{
+int grib_accessor_class_julian_date_t::pack_long(grib_accessor* a, const long* v, size_t* len){
     grib_context_log(a->context, GRIB_LOG_ERROR, " Cannot pack %s as long", a->name);
     return GRIB_NOT_IMPLEMENTED;
 }
 
-static int pack_expression(grib_accessor* a, grib_expression* e)
-{
+int grib_accessor_class_julian_date_t::pack_expression(grib_accessor* a, grib_expression* e){
     size_t len        = 1;
     long lval         = 0;
     double dval       = 0;
@@ -439,16 +319,14 @@ static int pack_expression(grib_accessor* a, grib_expression* e)
             }
             /*if (hand->context->debug)
                     printf("ECCODES DEBUG grib_accessor_class_gen::pack_expression %s %ld\n", a->name,lval);*/
-            return grib_pack_long(a, &lval, &len);
-        }
+            return a->pack_long(&lval, &len);        }
 
         case GRIB_TYPE_DOUBLE: {
             len = 1;
             ret = grib_expression_evaluate_double(hand, e, &dval);
             /*if (hand->context->debug)
                     printf("ECCODES DEBUG grib_accessor_class_gen::pack_expression %s %g\n", a->name, dval);*/
-            return grib_pack_double(a, &dval, &len);
-        }
+            return a->pack_double(&dval, &len);        }
 
         case GRIB_TYPE_STRING: {
             char tmp[1024];
@@ -461,8 +339,7 @@ static int pack_expression(grib_accessor* a, grib_expression* e)
             len = strlen(cval);
             /*if (hand->context->debug)
                     printf("ECCODES DEBUG grib_accessor_class_gen::pack_expression %s %s\n", a->name, cval);*/
-            return grib_pack_string(a, cval, &len);
-        }
+            return a->pack_string(cval, &len);        }
     }
 
     return GRIB_NOT_IMPLEMENTED;
diff --git a/src/accessor/grib_accessor_class_julian_date.h b/src/accessor/grib_accessor_class_julian_date.h
new file mode 100644
index 000000000..68008fec6
--- /dev/null
+++ b/src/accessor/grib_accessor_class_julian_date.h
@@ -0,0 +1,48 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_julian_date_h
+#define eccodes_accessor_julian_date_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_double.h"
+
+class grib_accessor_julian_date_t : public grib_accessor_double_t
+{
+public:
+    /* Members defined in julian_date */
+    const char *year;
+    const char *month;
+    const char *day;
+    const char *hour;
+    const char *minute;
+    const char *second;
+    const char *ymd;
+    const char *hms;
+    char sep[5];
+};
+
+class grib_accessor_class_julian_date_t : public grib_accessor_class_double_t
+{
+public:
+    grib_accessor_class_julian_date_t(const char* name) : grib_accessor_class_double_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_julian_date_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int pack_string(grib_accessor*, const char*, size_t* len) override;
+    int pack_expression(grib_accessor*, grib_expression*) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_julian_date_h */
diff --git a/src/accessor/grib_accessor_class_julian_day.cc b/src/accessor/grib_accessor_class_julian_day.cc
new file mode 100644
index 000000000..4e978c20e
--- /dev/null
+++ b/src/accessor/grib_accessor_class_julian_day.cc
@@ -0,0 +1,107 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_julian_day.h"
+
+grib_accessor_class_julian_day_t _grib_accessor_class_julian_day{"julian_day"};
+grib_accessor_class* grib_accessor_class_julian_day = &_grib_accessor_class_julian_day;
+
+
+void grib_accessor_class_julian_day_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_julian_day_t* self = (grib_accessor_julian_day_t*)a;
+    int n                          = 0;
+
+    self->date   = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->hour   = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->minute = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->second = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+
+    a->length = 0;
+}
+
+void grib_accessor_class_julian_day_t::dump(grib_accessor* a, grib_dumper* dumper){
+    grib_dump_string(dumper, a, NULL);
+}
+
+int grib_accessor_class_julian_day_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    const double v = *val;
+    return pack_double(a, &v, len);
+}
+
+int grib_accessor_class_julian_day_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_julian_day_t* self = (grib_accessor_julian_day_t*)a;
+    int ret                        = 0;
+    long hour                      = 0;
+    long minute                    = 0;
+    long second                    = 0;
+    long date                      = 0;
+    long year, month, day;
+
+    ret = grib_julian_to_datetime(*val, &year, &month, &day, &hour, &minute, &second);
+    if (ret != 0)
+        return ret;
+
+    date = year * 10000 + month * 100 + day;
+
+    ret = grib_set_long_internal(grib_handle_of_accessor(a), self->date, date);
+    if (ret != 0)
+        return ret;
+    ret = grib_set_long_internal(grib_handle_of_accessor(a), self->hour, hour);
+    if (ret != 0)
+        return ret;
+    ret = grib_set_long_internal(grib_handle_of_accessor(a), self->minute, minute);
+    if (ret != 0)
+        return ret;
+    ret = grib_set_long_internal(grib_handle_of_accessor(a), self->second, second);
+
+    return ret;
+}
+
+int grib_accessor_class_julian_day_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    int ret  = 0;
+    double v = 0;
+
+    ret  = unpack_double(a, &v, len);
+    *val = (long)v;
+
+    return ret;
+}
+
+int grib_accessor_class_julian_day_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    int ret = 0;
+    long date, hour, minute, second;
+    long year, month, day;
+    grib_accessor_julian_day_t* self = (grib_accessor_julian_day_t*)a;
+
+    ret = grib_get_long_internal(grib_handle_of_accessor(a), self->date, &date);
+    if (ret != GRIB_SUCCESS)
+        return ret;
+    ret = grib_get_long_internal(grib_handle_of_accessor(a), self->hour, &hour);
+    if (ret != GRIB_SUCCESS)
+        return ret;
+    ret = grib_get_long_internal(grib_handle_of_accessor(a), self->minute, &minute);
+    if (ret != GRIB_SUCCESS)
+        return ret;
+    ret = grib_get_long_internal(grib_handle_of_accessor(a), self->second, &second);
+    if (ret != GRIB_SUCCESS)
+        return ret;
+
+    year = date / 10000;
+    date %= 10000;
+    month = date / 100;
+    date %= 100;
+    day = date;
+
+    ret = grib_datetime_to_julian(year, month, day, hour, minute, second, val);
+
+    return ret;
+}
diff --git a/src/accessor/grib_accessor_class_julian_day.h b/src/accessor/grib_accessor_class_julian_day.h
new file mode 100644
index 000000000..1d21fb920
--- /dev/null
+++ b/src/accessor/grib_accessor_class_julian_day.h
@@ -0,0 +1,40 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_julian_day_h
+#define eccodes_accessor_julian_day_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_double.h"
+
+class grib_accessor_julian_day_t : public grib_accessor_double_t
+{
+public:
+    /* Members defined in julian_day */
+    const char *date;
+    const char *hour;
+    const char *minute;
+    const char *second;
+};
+
+class grib_accessor_class_julian_day_t : public grib_accessor_class_double_t
+{
+public:
+    grib_accessor_class_julian_day_t(const char* name) : grib_accessor_class_double_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_julian_day_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_julian_day_h */
diff --git a/src/accessor/grib_accessor_class_ksec1expver.cc b/src/accessor/grib_accessor_class_ksec1expver.cc
new file mode 100644
index 000000000..dcd3c336e
--- /dev/null
+++ b/src/accessor/grib_accessor_class_ksec1expver.cc
@@ -0,0 +1,95 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_ksec1expver.h"
+
+grib_accessor_class_ksec1expver_t _grib_accessor_class_ksec1expver{"ksec1expver"};
+grib_accessor_class* grib_accessor_class_ksec1expver = &_grib_accessor_class_ksec1expver;
+
+
+void grib_accessor_class_ksec1expver_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    a->length = len;
+    Assert(a->length >= 0);
+}
+
+int grib_accessor_class_ksec1expver_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    long value = 0;
+    long pos   = a->offset * 8;
+    char* intc = NULL;
+    char* pTemp = NULL;
+    char expver[5];
+    char refexpver[5];
+    size_t llen = a->length + 1;
+    Assert(a->length == 4);
+
+    if (*len < 1) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s it contains %d values ", a->name, 1);
+        *len = 0;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+    value = grib_decode_unsigned_long(grib_handle_of_accessor(a)->buffer->data, &pos, a->length * 8);
+
+    a->unpack_string(refexpver, &llen);
+    /* test for endian */
+    intc = (char*)&value;
+    pTemp = intc;
+
+    expver[0] = *pTemp++;
+    expver[1] = *pTemp++;
+    expver[2] = *pTemp++;
+    expver[3] = *pTemp++;
+    expver[4] = 0;
+
+//     expver[0] = intc[0];
+//     expver[1] = intc[1];
+//     expver[2] = intc[2];
+//     expver[3] = intc[3];
+//     expver[4] = 0;
+
+    /* if there is a difference, have to reverse*/
+    if (strcmp(refexpver, expver)) {
+        intc[0] = expver[3];
+        intc[1] = expver[2];
+        intc[2] = expver[1];
+        intc[3] = expver[0];
+    }
+
+    *val = value;
+    *len = 1;
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_ksec1expver_t::pack_string(grib_accessor* a, const char* val, size_t* len){
+    int i = 0;
+    if (len[0] != 4) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong length for %s. It has to be 4", a->name);
+        return GRIB_INVALID_KEY_VALUE;
+    }
+    if (len[0] > (a->length) + 1) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "pack_string: Wrong size (%lu) for %s, it contains %ld values",
+                len[0], a->name, a->length + 1);
+        len[0] = 0;
+        return GRIB_BUFFER_TOO_SMALL;
+    }
+
+    for (i = 0; i < a->length; i++)
+        grib_handle_of_accessor(a)->buffer->data[a->offset + i] = val[i];
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_ksec1expver_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    char sval[5] = {0,};
+    size_t slen = 4;
+    snprintf(sval, sizeof(sval), "%04d", (int)(*val));
+    return pack_string(a, sval, &slen);
+}
diff --git a/src/accessor/grib_accessor_class_ksec1expver.h b/src/accessor/grib_accessor_class_ksec1expver.h
new file mode 100644
index 000000000..3884a7709
--- /dev/null
+++ b/src/accessor/grib_accessor_class_ksec1expver.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_ksec1expver_h
+#define eccodes_accessor_ksec1expver_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_ascii.h"
+
+class grib_accessor_ksec1expver_t : public grib_accessor_ascii_t
+{
+public:
+    /* Members defined in ksec1expver */
+};
+
+class grib_accessor_class_ksec1expver_t : public grib_accessor_class_ascii_t
+{
+public:
+    grib_accessor_class_ksec1expver_t(const char* name) : grib_accessor_class_ascii_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_ksec1expver_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int pack_string(grib_accessor*, const char*, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_ksec1expver_h */
diff --git a/src/accessor/grib_accessor_class_label.cc b/src/accessor/grib_accessor_class_label.cc
new file mode 100644
index 000000000..547bdb11a
--- /dev/null
+++ b/src/accessor/grib_accessor_class_label.cc
@@ -0,0 +1,40 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_label.h"
+
+grib_accessor_class_label_t _grib_accessor_class_label{"label"};
+grib_accessor_class* grib_accessor_class_label = &_grib_accessor_class_label;
+
+
+void grib_accessor_class_label_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->flags |= GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC;
+    a->length = 0;
+}
+
+void grib_accessor_class_label_t::dump(grib_accessor* a, grib_dumper* dumper){
+    grib_dump_label(dumper, a, NULL);
+}
+
+int grib_accessor_class_label_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_LABEL;
+}
+
+int grib_accessor_class_label_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    size_t vlen = strlen(a->name);
+    if (vlen > *len)
+        return GRIB_BUFFER_TOO_SMALL;
+    *len = vlen;
+    strcpy(val, a->name);
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_label.h b/src/accessor/grib_accessor_class_label.h
new file mode 100644
index 000000000..c4e64b322
--- /dev/null
+++ b/src/accessor/grib_accessor_class_label.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_label_h
+#define eccodes_accessor_label_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_label_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in label */
+};
+
+class grib_accessor_class_label_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_label_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_label_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_label_h */
diff --git a/src/accessor/todo/grib_accessor_class_latitudes.cc b/src/accessor/grib_accessor_class_latitudes.cc
similarity index 59%
rename from src/accessor/todo/grib_accessor_class_latitudes.cc
rename to src/accessor/grib_accessor_class_latitudes.cc
index 4131ff066..65fcf65a8 100644
--- a/src/accessor/todo/grib_accessor_class_latitudes.cc
+++ b/src/accessor/grib_accessor_class_latitudes.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,111 +10,15 @@
  */
 
 #include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_double
-   IMPLEMENTS = unpack_double;
-   IMPLEMENTS = value_count
-   IMPLEMENTS = init
-   MEMBERS =const char* values
-   MEMBERS =long distinct
-   MEMBERS =double* lats
-   MEMBERS =long size
-   MEMBERS =int save
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_latitudes
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in latitudes */
-    const char* values;
-    long distinct;
-    double* lats;
-    long size;
-    int save;
-} grib_accessor_latitudes;
-
-extern grib_accessor_class* grib_accessor_class_double;
-
-static grib_accessor_class _grib_accessor_class_latitudes = {
-    &grib_accessor_class_double,                      /* super */
-    "latitudes",                      /* name */
-    sizeof(grib_accessor_latitudes),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_latitudes.h"
 
+grib_accessor_class_latitudes_t _grib_accessor_class_latitudes{"latitudes"};
 grib_accessor_class* grib_accessor_class_latitudes = &_grib_accessor_class_latitudes;
 
-/* END_CLASS_IMP */
 
 
 static int get_distinct(grib_accessor* a, double** val, long* len);
-
-static int compare_doubles(const void* a, const void* b, int ascending)
-{
+int compare_doubles(const void* a, const void* b, int ascending){
     /* ascending is a boolean: 0 or 1 */
     double* arg1 = (double*)a;
     double* arg2 = (double*)b;
@@ -130,18 +35,15 @@ static int compare_doubles(const void* a, const void* b, int ascending)
     else
         return 1;
 }
-static int compare_doubles_ascending(const void* a, const void* b)
-{
+int compare_doubles_ascending(const void* a, const void* b){
     return compare_doubles(a, b, 1);
 }
-static int compare_doubles_descending(const void* a, const void* b)
-{
+int compare_doubles_descending(const void* a, const void* b){
     return compare_doubles(a, b, 0);
 }
 
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_latitudes* self = (grib_accessor_latitudes*)a;
+void grib_accessor_class_latitudes_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_latitudes_t* self = (grib_accessor_latitudes_t*)a;
     int n                         = 0;
 
     self->values   = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
@@ -151,10 +53,9 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
     a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
+int grib_accessor_class_latitudes_t::unpack_double(grib_accessor* a, double* val, size_t* len){
     grib_context* c               = a->context;
-    grib_accessor_latitudes* self = (grib_accessor_latitudes*)a;
+    grib_accessor_latitudes_t* self = (grib_accessor_latitudes_t*)a;
     int ret = 0;
     double* v = val;
     double dummyLon = 0;
@@ -205,9 +106,8 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     return ret;
 }
 
-static int value_count(grib_accessor* a, long* len)
-{
-    grib_accessor_latitudes* self = (grib_accessor_latitudes*)a;
+int grib_accessor_class_latitudes_t::value_count(grib_accessor* a, long* len){
+    grib_accessor_latitudes_t* self = (grib_accessor_latitudes_t*)a;
     grib_handle* h                = grib_handle_of_accessor(a);
     grib_context* c               = a->context;
     double* val                   = NULL;
@@ -237,8 +137,7 @@ static int value_count(grib_accessor* a, long* len)
     return ret;
 }
 
-static int get_distinct(grib_accessor* a, double** val, long* len)
-{
+static int get_distinct(grib_accessor* a, double** val, long* len){
     long count = 0;
     double prev;
     double* v       = NULL;
diff --git a/src/accessor/grib_accessor_class_latitudes.h b/src/accessor/grib_accessor_class_latitudes.h
new file mode 100644
index 000000000..10344c7cb
--- /dev/null
+++ b/src/accessor/grib_accessor_class_latitudes.h
@@ -0,0 +1,38 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_latitudes_h
+#define eccodes_accessor_latitudes_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_double.h"
+
+class grib_accessor_latitudes_t : public grib_accessor_double_t
+{
+public:
+    /* Members defined in latitudes */
+    const char* values;
+    long distinct;
+    double* lats;
+    long size;
+    int save;
+};
+
+class grib_accessor_class_latitudes_t : public grib_accessor_class_double_t
+{
+public:
+    grib_accessor_class_latitudes_t(const char* name) : grib_accessor_class_double_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_latitudes_t{}; }
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_latitudes_h */
diff --git a/src/accessor/todo/grib_accessor_class_latlon_increment.cc b/src/accessor/grib_accessor_class_latlon_increment.cc
similarity index 61%
rename from src/accessor/todo/grib_accessor_class_latlon_increment.cc
rename to src/accessor/grib_accessor_class_latlon_increment.cc
index de43e60c9..3ecff170a 100644
--- a/src/accessor/todo/grib_accessor_class_latlon_increment.cc
+++ b/src/accessor/grib_accessor_class_latlon_increment.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,117 +10,14 @@
  */
 
 #include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_double
-   IMPLEMENTS = unpack_double;pack_double;is_missing
-   IMPLEMENTS = init
-   MEMBERS=const char*                  directionIncrementGiven
-   MEMBERS=const char*                  directionIncrement
-   MEMBERS=const char*                  scansPositively
-   MEMBERS=const char*                  first
-   MEMBERS=const char*                  last
-   MEMBERS=const char*                  numberOfPoints
-   MEMBERS=const char*                  angleMultiplier
-   MEMBERS=const char*                  angleDivisor
-   MEMBERS=long                   isLongitude
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int is_missing(grib_accessor*);
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_latlon_increment
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in latlon_increment */
-    const char*                  directionIncrementGiven;
-    const char*                  directionIncrement;
-    const char*                  scansPositively;
-    const char*                  first;
-    const char*                  last;
-    const char*                  numberOfPoints;
-    const char*                  angleMultiplier;
-    const char*                  angleDivisor;
-    long                   isLongitude;
-} grib_accessor_latlon_increment;
-
-extern grib_accessor_class* grib_accessor_class_double;
-
-static grib_accessor_class _grib_accessor_class_latlon_increment = {
-    &grib_accessor_class_double,                      /* super */
-    "latlon_increment",                      /* name */
-    sizeof(grib_accessor_latlon_increment),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    &is_missing,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_latlon_increment.h"
 
+grib_accessor_class_latlon_increment_t _grib_accessor_class_latlon_increment{"latlon_increment"};
 grib_accessor_class* grib_accessor_class_latlon_increment = &_grib_accessor_class_latlon_increment;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_latlon_increment* self = (grib_accessor_latlon_increment*)a;
+void grib_accessor_class_latlon_increment_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_latlon_increment_t* self = (grib_accessor_latlon_increment_t*)a;
     int n                                = 0;
     grib_handle* hand                    = grib_handle_of_accessor(a);
 
@@ -134,9 +32,8 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
     self->isLongitude             = grib_arguments_get_long(hand, c, n++);
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_latlon_increment* self = (grib_accessor_latlon_increment*)a;
+int grib_accessor_class_latlon_increment_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_latlon_increment_t* self = (grib_accessor_latlon_increment_t*)a;
     int ret                              = 0;
     grib_handle* hand                    = grib_handle_of_accessor(a);
 
@@ -221,9 +118,8 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     return ret;
 }
 
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_latlon_increment* self = (grib_accessor_latlon_increment*)a;
+int grib_accessor_class_latlon_increment_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_latlon_increment_t* self = (grib_accessor_latlon_increment_t*)a;
     int ret                              = 0;
     long codedNumberOfPoints             = 0;
     grib_handle* hand                    = grib_handle_of_accessor(a);
@@ -305,8 +201,7 @@ static int pack_double(grib_accessor* a, const double* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int is_missing(grib_accessor* a)
-{
+int grib_accessor_class_latlon_increment_t::is_missing(grib_accessor* a){
     size_t len = 1;
     double val = 0;
 
diff --git a/src/accessor/grib_accessor_class_latlon_increment.h b/src/accessor/grib_accessor_class_latlon_increment.h
new file mode 100644
index 000000000..4f5402e6a
--- /dev/null
+++ b/src/accessor/grib_accessor_class_latlon_increment.h
@@ -0,0 +1,43 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_latlon_increment_h
+#define eccodes_accessor_latlon_increment_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_double.h"
+
+class grib_accessor_latlon_increment_t : public grib_accessor_double_t
+{
+public:
+    /* Members defined in latlon_increment */
+    const char*                  directionIncrementGiven;
+    const char*                  directionIncrement;
+    const char*                  scansPositively;
+    const char*                  first;
+    const char*                  last;
+    const char*                  numberOfPoints;
+    const char*                  angleMultiplier;
+    const char*                  angleDivisor;
+    long                   isLongitude;
+};
+
+class grib_accessor_class_latlon_increment_t : public grib_accessor_class_double_t
+{
+public:
+    grib_accessor_class_latlon_increment_t(const char* name) : grib_accessor_class_double_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_latlon_increment_t{}; }
+    int is_missing(grib_accessor*) override;
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_latlon_increment_h */
diff --git a/src/accessor/grib_accessor_class_latlonvalues.cc b/src/accessor/grib_accessor_class_latlonvalues.cc
new file mode 100644
index 000000000..ca52ffb6d
--- /dev/null
+++ b/src/accessor/grib_accessor_class_latlonvalues.cc
@@ -0,0 +1,76 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_latlonvalues.h"
+
+grib_accessor_class_latlonvalues_t _grib_accessor_class_latlonvalues{"latlonvalues"};
+grib_accessor_class* grib_accessor_class_latlonvalues = &_grib_accessor_class_latlonvalues;
+
+
+void grib_accessor_class_latlonvalues_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_latlonvalues_t* self = (grib_accessor_latlonvalues_t*)a;
+    int n                            = 0;
+
+    self->values = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+}
+
+int grib_accessor_class_latlonvalues_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_context* c = a->context;
+    int err         = 0;
+    double* v       = val;
+    double lat, lon, value;
+    size_t size         = 0;
+    long count          = 0;
+    grib_iterator* iter = grib_iterator_new(grib_handle_of_accessor(a), 0, &err);
+    if (err) {
+        if (iter) grib_iterator_delete(iter);
+        grib_context_log(c, GRIB_LOG_ERROR, "latlonvalues: Unable to create iterator");
+        return err;
+    }
+
+    err  = value_count(a, &count);
+    if (err) return err;
+    size = count;
+
+    if (*len < size) {
+        if (iter) grib_iterator_delete(iter);
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    while (grib_iterator_next(iter, &lat, &lon, &value)) {
+        *(v++) = lat;
+        *(v++) = lon;
+        *(v++) = value;
+    }
+
+    grib_iterator_delete(iter);
+
+    *len = size;
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_latlonvalues_t::value_count(grib_accessor* a, long* count){
+    grib_accessor_latlonvalues_t* self = (grib_accessor_latlonvalues_t*)a;
+    grib_handle* h                   = grib_handle_of_accessor(a);
+    int ret = GRIB_SUCCESS;
+    size_t size;
+    if ((ret = grib_get_size(h, self->values, &size)) != GRIB_SUCCESS) {
+        grib_context_log(h->context, GRIB_LOG_ERROR, "latlonvalues: Unable to get size of %s", self->values);
+        return ret;
+    }
+
+    *count = 3 * size;
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_latlonvalues.h b/src/accessor/grib_accessor_class_latlonvalues.h
new file mode 100644
index 000000000..ed040f543
--- /dev/null
+++ b/src/accessor/grib_accessor_class_latlonvalues.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_latlonvalues_h
+#define eccodes_accessor_latlonvalues_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_double.h"
+
+class grib_accessor_latlonvalues_t : public grib_accessor_double_t
+{
+public:
+    /* Members defined in latlonvalues */
+    const char* values;
+};
+
+class grib_accessor_class_latlonvalues_t : public grib_accessor_class_double_t
+{
+public:
+    grib_accessor_class_latlonvalues_t(const char* name) : grib_accessor_class_double_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_latlonvalues_t{}; }
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_latlonvalues_h */
diff --git a/src/accessor/grib_accessor_class_library_version.cc b/src/accessor/grib_accessor_class_library_version.cc
new file mode 100644
index 000000000..61fafe279
--- /dev/null
+++ b/src/accessor/grib_accessor_class_library_version.cc
@@ -0,0 +1,46 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_library_version.h"
+
+grib_accessor_class_library_version_t _grib_accessor_class_library_version{"library_version"};
+grib_accessor_class* grib_accessor_class_library_version = &_grib_accessor_class_library_version;
+
+
+int grib_accessor_class_library_version_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    char result[30] = {0,};
+    size_t size;
+
+    int major    = ECCODES_MAJOR_VERSION;
+    int minor    = ECCODES_MINOR_VERSION;
+    int revision = ECCODES_REVISION_VERSION;
+
+    snprintf(result,  sizeof(result), "%d.%d.%d", major, minor, revision);
+    size = sizeof(result);
+
+    if (*len < size)
+        return GRIB_ARRAY_TOO_SMALL;
+    strcpy(val, result);
+
+    *len = size;
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_library_version_t::value_count(grib_accessor* a, long* count){
+    *count = 1;
+    return 0;
+}
+
+size_t grib_accessor_class_library_version_t::string_length(grib_accessor* a){
+    return 255;
+}
diff --git a/src/accessor/grib_accessor_class_library_version.h b/src/accessor/grib_accessor_class_library_version.h
new file mode 100644
index 000000000..28de10364
--- /dev/null
+++ b/src/accessor/grib_accessor_class_library_version.h
@@ -0,0 +1,33 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_library_version_h
+#define eccodes_accessor_library_version_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_ascii.h"
+
+class grib_accessor_library_version_t : public grib_accessor_ascii_t
+{
+public:
+    /* Members defined in library_version */
+};
+
+class grib_accessor_class_library_version_t : public grib_accessor_class_ascii_t
+{
+public:
+    grib_accessor_class_library_version_t(const char* name) : grib_accessor_class_ascii_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_library_version_t{}; }
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    size_t string_length(grib_accessor*) override;
+    int value_count(grib_accessor*, long*) override;
+};
+#endif /* eccodes_accessor_library_version_h */
diff --git a/src/accessor/todo/grib_accessor_class_local_definition.cc b/src/accessor/grib_accessor_class_local_definition.cc
similarity index 72%
rename from src/accessor/todo/grib_accessor_class_local_definition.cc
rename to src/accessor/grib_accessor_class_local_definition.cc
index 782ce5fde..c216ddb2a 100644
--- a/src/accessor/todo/grib_accessor_class_local_definition.cc
+++ b/src/accessor/grib_accessor_class_local_definition.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,125 +9,15 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-/**************************************
- *  This pertains to GRIB edition 2
- **************************************/
-
 #include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_unsigned
-   IMPLEMENTS = unpack_long;pack_long; value_count
-   IMPLEMENTS = init
-   MEMBERS=const char*    productDefinitionTemplateNumber
-   MEMBERS=const char*    productDefinitionTemplateNumberInternal
-   MEMBERS=const char* grib2LocalSectionNumber
-   MEMBERS=const char* type
-   MEMBERS=const char* stream
-   MEMBERS=const char* the_class
-   MEMBERS=const char* eps
-   MEMBERS=const char* stepType
-   MEMBERS=const char* derivedForecast
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_local_definition
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in unsigned */
-    long nbytes;
-    grib_arguments* arg;
-    /* Members defined in local_definition */
-    const char*    productDefinitionTemplateNumber;
-    const char*    productDefinitionTemplateNumberInternal;
-    const char* grib2LocalSectionNumber;
-    const char* type;
-    const char* stream;
-    const char* the_class;
-    const char* eps;
-    const char* stepType;
-    const char* derivedForecast;
-} grib_accessor_local_definition;
-
-extern grib_accessor_class* grib_accessor_class_unsigned;
-
-static grib_accessor_class _grib_accessor_class_local_definition = {
-    &grib_accessor_class_unsigned,                      /* super */
-    "local_definition",                      /* name */
-    sizeof(grib_accessor_local_definition),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_local_definition.h"
 
+grib_accessor_class_local_definition_t _grib_accessor_class_local_definition{"local_definition"};
 grib_accessor_class* grib_accessor_class_local_definition = &_grib_accessor_class_local_definition;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_local_definition* self = (grib_accessor_local_definition*)a;
+void grib_accessor_class_local_definition_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_local_definition_t* self = (grib_accessor_local_definition_t*)a;
     grib_handle* hand                    = grib_handle_of_accessor(a);
     int n                                = 0;
 
@@ -141,16 +32,14 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
     self->derivedForecast                         = grib_arguments_get_name(hand, c, n++);
 }
 
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_local_definition* self = (grib_accessor_local_definition*)a;
+int grib_accessor_class_local_definition_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_local_definition_t* self = (grib_accessor_local_definition_t*)a;
 
     return grib_get_long(grib_handle_of_accessor(a), self->grib2LocalSectionNumber, val);
 }
 
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_local_definition* self         = (grib_accessor_local_definition*)a;
+int grib_accessor_class_local_definition_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_local_definition_t* self         = (grib_accessor_local_definition_t*)a;
     grib_handle* hand                            = grib_handle_of_accessor(a);
     long productDefinitionTemplateNumber         = -1;
     long productDefinitionTemplateNumberInternal = -1;
@@ -316,7 +205,7 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
 #ifdef DEBUG
             // In test & development mode, fail so we remember to adjust PDTN
             grib_context_log(a->context, GRIB_LOG_ERROR,
-                             "grib_accessor_local_definition: Invalid localDefinitionNumber %d", localDefinitionNumber);
+                             "grib_accessor_local_definition_t: Invalid localDefinitionNumber %d", localDefinitionNumber);
             return GRIB_ENCODING_ERROR;
 #endif
             // ECC-1253: Do not fail in operations. Leave PDTN as is
@@ -419,7 +308,7 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
 
     if (productDefinitionTemplateNumber != productDefinitionTemplateNumberNew) {
         if (a->context->debug) {
-            fprintf(stderr, "ECCODES DEBUG grib_accessor_local_definition: ldNumber=%d, newPDTN=%ld\n",
+            fprintf(stderr, "ECCODES DEBUG grib_accessor_local_definition_t: ldNumber=%d, newPDTN=%ld\n",
                    localDefinitionNumber, productDefinitionTemplateNumberNew);
         }
         if (tooEarly)
@@ -435,8 +324,7 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
     return 0;
 }
 
-static int value_count(grib_accessor* a, long* count)
-{
+int grib_accessor_class_local_definition_t::value_count(grib_accessor* a, long* count){
     *count = 1;
     return 0;
 }
diff --git a/src/accessor/grib_accessor_class_local_definition.h b/src/accessor/grib_accessor_class_local_definition.h
new file mode 100644
index 000000000..296bab69d
--- /dev/null
+++ b/src/accessor/grib_accessor_class_local_definition.h
@@ -0,0 +1,43 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_local_definition_h
+#define eccodes_accessor_local_definition_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_unsigned.h"
+
+class grib_accessor_local_definition_t : public grib_accessor_unsigned_t
+{
+public:
+    /* Members defined in local_definition */
+    const char*    productDefinitionTemplateNumber;
+    const char*    productDefinitionTemplateNumberInternal;
+    const char* grib2LocalSectionNumber;
+    const char* type;
+    const char* stream;
+    const char* the_class;
+    const char* eps;
+    const char* stepType;
+    const char* derivedForecast;
+};
+
+class grib_accessor_class_local_definition_t : public grib_accessor_class_unsigned_t
+{
+public:
+    grib_accessor_class_local_definition_t(const char* name) : grib_accessor_class_unsigned_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_local_definition_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_local_definition_h */
diff --git a/src/accessor/grib_accessor_class_long_vector.cc b/src/accessor/grib_accessor_class_long_vector.cc
new file mode 100644
index 000000000..d99b6e860
--- /dev/null
+++ b/src/accessor/grib_accessor_class_long_vector.cc
@@ -0,0 +1,95 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_long_vector.h"
+#include "grib_accessor_class_abstract_long_vector.h"
+
+grib_accessor_class_long_vector_t _grib_accessor_class_long_vector{"long_vector"};
+grib_accessor_class* grib_accessor_class_long_vector = &_grib_accessor_class_long_vector;
+
+
+void grib_accessor_class_long_vector_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_long_vector_t* self       = (grib_accessor_long_vector_t*)a;
+    grib_accessor* va                     = NULL;
+    grib_accessor_abstract_long_vector_t* v = NULL;
+    int n                                 = 0;
+
+    self->vector = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    va = (grib_accessor*)grib_find_accessor(grib_handle_of_accessor(a), self->vector);
+    v  = (grib_accessor_abstract_long_vector_t*)va;
+
+    self->index = grib_arguments_get_long(grib_handle_of_accessor(a), c, n++);
+
+    /* check self->index on init and never change it */
+    Assert(self->index < v->number_of_elements && self->index >= 0);
+
+    a->length = 0;
+}
+
+int grib_accessor_class_long_vector_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    size_t size = 0;
+    int err = 0;
+    long* vector;
+    grib_accessor_long_vector_t* self       = (grib_accessor_long_vector_t*)a;
+    grib_accessor* va                     = NULL;
+    grib_accessor_abstract_long_vector_t* v = NULL;
+
+    va = (grib_accessor*)grib_find_accessor(grib_handle_of_accessor(a), self->vector);
+    v  = (grib_accessor_abstract_long_vector_t*)va;
+
+    /*TODO implement the dirty mechanism to avoid to unpack every time */
+    err = grib_get_size(grib_handle_of_accessor(a), self->vector, &size);
+    if (err) return err;
+    DEBUG_ASSERT(size > 0);
+    vector = (long*)grib_context_malloc(a->context, sizeof(long) * size);
+    err = va->unpack_long(vector, &size);    grib_context_free(a->context, vector);
+    if (err) return err;
+
+    *val = v->v[self->index];
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_long_vector_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    long lval                             = 0;
+    int err                               = 0;
+    grib_accessor_long_vector_t* self       = (grib_accessor_long_vector_t*)a;
+    grib_accessor* va                     = NULL;
+    grib_accessor_abstract_long_vector_t* v = NULL;
+    va                                    = (grib_accessor*)grib_find_accessor(grib_handle_of_accessor(a), self->vector);
+    v                                     = (grib_accessor_abstract_long_vector_t*)va;
+
+    err = unpack_long(a, &lval, len);
+
+    *val = (double)v->v[self->index];
+
+    return err;
+}
+
+int grib_accessor_class_long_vector_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    int err                               = 0;
+    grib_accessor_long_vector_t* self       = (grib_accessor_long_vector_t*)a;
+    grib_accessor* va                     = NULL;
+    grib_accessor_abstract_long_vector_t* v = NULL;
+
+    va = (grib_accessor*)grib_find_accessor(grib_handle_of_accessor(a), self->vector);
+    v  = (grib_accessor_abstract_long_vector_t*)va;
+
+    v->pack_index = self->index;
+
+    err = va->pack_long(val, len);
+    return err;
+}
+
+int grib_accessor_class_long_vector_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_LONG;
+}
diff --git a/src/accessor/grib_accessor_class_long_vector.h b/src/accessor/grib_accessor_class_long_vector.h
new file mode 100644
index 000000000..66fab29e6
--- /dev/null
+++ b/src/accessor/grib_accessor_class_long_vector.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_long_vector_h
+#define eccodes_accessor_long_vector_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_abstract_long_vector.h"
+
+class grib_accessor_long_vector_t : public grib_accessor_abstract_long_vector_t
+{
+public:
+    /* Members defined in long_vector */
+    const char* vector;
+    int index;
+};
+
+class grib_accessor_class_long_vector_t : public grib_accessor_class_abstract_long_vector_t
+{
+public:
+    grib_accessor_class_long_vector_t(const char* name) : grib_accessor_class_abstract_long_vector_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_long_vector_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_long_vector_h */
diff --git a/src/accessor/todo/grib_accessor_class_longitudes.cc b/src/accessor/grib_accessor_class_longitudes.cc
similarity index 56%
rename from src/accessor/todo/grib_accessor_class_longitudes.cc
rename to src/accessor/grib_accessor_class_longitudes.cc
index 083d40138..09fd4a4e6 100644
--- a/src/accessor/todo/grib_accessor_class_longitudes.cc
+++ b/src/accessor/grib_accessor_class_longitudes.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,113 +10,17 @@
  */
 
 #include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_double
-   IMPLEMENTS = unpack_double;
-   IMPLEMENTS = value_count
-   IMPLEMENTS = init
-   MEMBERS =const char* values
-   MEMBERS =long distinct
-   MEMBERS =double* lons
-   MEMBERS =long size
-   MEMBERS =int save
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_longitudes
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in longitudes */
-    const char* values;
-    long distinct;
-    double* lons;
-    long size;
-    int save;
-} grib_accessor_longitudes;
-
-extern grib_accessor_class* grib_accessor_class_double;
-
-static grib_accessor_class _grib_accessor_class_longitudes = {
-    &grib_accessor_class_double,                      /* super */
-    "longitudes",                      /* name */
-    sizeof(grib_accessor_longitudes),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_longitudes.h"
 
+grib_accessor_class_longitudes_t _grib_accessor_class_longitudes{"longitudes"};
 grib_accessor_class* grib_accessor_class_longitudes = &_grib_accessor_class_longitudes;
 
-/* END_CLASS_IMP */
 
 
 static int get_distinct(grib_accessor* a, double** val, long* len);
-static int compare_doubles(const void* a, const void* b);
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_longitudes* self = (grib_accessor_longitudes*)a;
+int compare_doubles(const void* a, const void* b);
+void grib_accessor_class_longitudes_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_longitudes_t* self = (grib_accessor_longitudes_t*)a;
     int n = 0;
 
     self->values   = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
@@ -126,10 +31,9 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
     a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
+int grib_accessor_class_longitudes_t::unpack_double(grib_accessor* a, double* val, size_t* len){
     grib_context* c                = a->context;
-    grib_accessor_longitudes* self = (grib_accessor_longitudes*)a;
+    grib_accessor_longitudes_t* self = (grib_accessor_longitudes_t*)a;
     int ret                        = 0;
     double* v                      = val;
     double dummyLat = 0;
@@ -181,9 +85,8 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     return ret;
 }
 
-static int value_count(grib_accessor* a, long* len)
-{
-    grib_accessor_longitudes* self = (grib_accessor_longitudes*)a;
+int grib_accessor_class_longitudes_t::value_count(grib_accessor* a, long* len){
+    grib_accessor_longitudes_t* self = (grib_accessor_longitudes_t*)a;
     grib_handle* h                 = grib_handle_of_accessor(a);
     grib_context* c                = a->context;
     double* val                    = NULL;
@@ -212,8 +115,7 @@ static int value_count(grib_accessor* a, long* len)
     return ret;
 }
 
-static int get_distinct(grib_accessor* a, double** val, long* len)
-{
+static int get_distinct(grib_accessor* a, double** val, long* len){
     long count = 0;
     double prev;
     double* v       = NULL;
@@ -270,8 +172,7 @@ static int get_distinct(grib_accessor* a, double** val, long* len)
     return GRIB_SUCCESS;
 }
 
-static int compare_doubles(const void* a, const void* b)
-{
+int compare_doubles(const void* a, const void* b){
     double* arg1 = (double*)a;
     double* arg2 = (double*)b;
     if (*arg1 < *arg2)
diff --git a/src/accessor/grib_accessor_class_longitudes.h b/src/accessor/grib_accessor_class_longitudes.h
new file mode 100644
index 000000000..782b4d764
--- /dev/null
+++ b/src/accessor/grib_accessor_class_longitudes.h
@@ -0,0 +1,38 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_longitudes_h
+#define eccodes_accessor_longitudes_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_double.h"
+
+class grib_accessor_longitudes_t : public grib_accessor_double_t
+{
+public:
+    /* Members defined in longitudes */
+    const char* values;
+    long distinct;
+    double* lons;
+    long size;
+    int save;
+};
+
+class grib_accessor_class_longitudes_t : public grib_accessor_class_double_t
+{
+public:
+    grib_accessor_class_longitudes_t(const char* name) : grib_accessor_class_double_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_longitudes_t{}; }
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_longitudes_h */
diff --git a/src/accessor/grib_accessor_class_lookup.cc b/src/accessor/grib_accessor_class_lookup.cc
new file mode 100644
index 000000000..d480866c5
--- /dev/null
+++ b/src/accessor/grib_accessor_class_lookup.cc
@@ -0,0 +1,133 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_lookup.h"
+
+grib_accessor_class_lookup_t _grib_accessor_class_lookup{"lookup"};
+grib_accessor_class* grib_accessor_class_lookup = &_grib_accessor_class_lookup;
+
+
+void grib_accessor_class_lookup_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    grib_accessor_lookup_t* self = (grib_accessor_lookup_t*)a;
+    a->length                  = 0;
+    self->llength              = len;
+    self->loffset              = grib_arguments_get_long(grib_handle_of_accessor(a), arg, 0);
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    self->real_name = grib_arguments_get_expression(grib_handle_of_accessor(a), arg, 1);
+}
+
+void grib_accessor_class_lookup_t::post_init(grib_accessor* a){
+    grib_accessor_lookup_t* self = (grib_accessor_lookup_t*)a;
+    if (self->real_name) {
+        grib_dependency_observe_expression(a, self->real_name);
+    }
+}
+
+void grib_accessor_class_lookup_t::dump(grib_accessor* a, grib_dumper* dumper){
+    grib_accessor_lookup_t* self = (grib_accessor_lookup_t*)a;
+    unsigned char bytes[1024]  = {0,};
+    char msg[1024] = {0,};
+    char buf[2048];
+    int i;
+    unsigned long v = 0;
+
+    size_t llen = self->llength;
+    a->unpack_bytes(bytes, &llen);
+    bytes[llen] = 0;
+    for (i = 0; i < llen; i++) {
+        msg[i] = isprint(bytes[i]) ? bytes[i] : '?';
+        v <<= 8;
+        v |= bytes[i];
+    }
+
+    msg[llen] = 0;
+
+    snprintf(buf, sizeof(buf), "%s %lu %ld-%ld", msg, v, (long)a->offset + self->loffset, (long)self->llength);
+
+    grib_dump_long(dumper, a, buf);
+}
+
+int grib_accessor_class_lookup_t::unpack_string(grib_accessor* a, char* v, size_t* len){
+    grib_accessor_lookup_t* self = (grib_accessor_lookup_t*)a;
+    unsigned char bytes[1024]  = {0,};
+    int i;
+
+    size_t llen = self->llength;
+    a->unpack_bytes(bytes, &llen);
+    bytes[llen] = 0;
+
+    for (i = 0; i < llen; i++) {
+        v[i] = isprint(bytes[i]) ? bytes[i] : '?';
+    }
+
+    v[llen] = 0;
+    if (llen == 1 && v[0] == '?') {
+        /* Try unpack as long */
+        size_t length = 10;
+        long lval     = 0;
+        int err       = unpack_long(a, &lval, &length);
+        if (!err) {
+            char str[5];
+            int conv = snprintf(str, sizeof(str), "%ld", lval);
+            if (conv == 1) {
+                v[0] = str[0];
+            }
+        }
+    }
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_lookup_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_lookup_t* self = (grib_accessor_lookup_t*)a;
+    grib_handle* h           = grib_handle_of_accessor(a);
+
+    long pos = (a->offset + self->loffset) * 8;
+
+    if (len[0] < 1) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s it contains %d values ", a->name, 1);
+        len[0] = 0;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    /* This is used when reparsing or rebuilding */
+    if (h->loader) {
+        Assert(*len == 1);
+        return h->loader->lookup_long(h->context, h->loader, a->name, val);
+    }
+
+    val[0] = grib_decode_unsigned_long(h->buffer->data, &pos, self->llength * 8);
+    len[0] = 1;
+
+    /*printf("###########lookup unpack_long: %s %ld %ld\n",a->name, pos/8, val[0]);*/
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_lookup_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    return GRIB_NOT_IMPLEMENTED;
+}
+
+long grib_accessor_class_lookup_t::byte_count(grib_accessor* a){
+    grib_accessor_lookup_t* self = (grib_accessor_lookup_t*)a;
+    return self->llength;
+}
+
+long grib_accessor_class_lookup_t::byte_offset(grib_accessor* a){
+    grib_accessor_lookup_t* self = (grib_accessor_lookup_t*)a;
+    return self->loffset;
+}
+
+int grib_accessor_class_lookup_t::notify_change(grib_accessor* self, grib_accessor* changed){
+    /* Forward changes */
+    return grib_dependency_notify_change(self);
+}
diff --git a/src/accessor/grib_accessor_class_lookup.h b/src/accessor/grib_accessor_class_lookup.h
new file mode 100644
index 000000000..4237d4517
--- /dev/null
+++ b/src/accessor/grib_accessor_class_lookup.h
@@ -0,0 +1,42 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_lookup_h
+#define eccodes_accessor_lookup_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_lookup_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in lookup */
+    long llength;
+    long loffset;
+    grib_expression* real_name;
+};
+
+class grib_accessor_class_lookup_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_lookup_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_lookup_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    long byte_count(grib_accessor*) override;
+    long byte_offset(grib_accessor*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    void post_init(grib_accessor*) override;
+    int notify_change(grib_accessor*, grib_accessor*) override;
+};
+#endif /* eccodes_accessor_lookup_h */
diff --git a/src/accessor/grib_accessor_class_mars_param.cc b/src/accessor/grib_accessor_class_mars_param.cc
new file mode 100644
index 000000000..76b55a1fe
--- /dev/null
+++ b/src/accessor/grib_accessor_class_mars_param.cc
@@ -0,0 +1,53 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_mars_param.h"
+
+grib_accessor_class_mars_param_t _grib_accessor_class_mars_param{"mars_param"};
+grib_accessor_class* grib_accessor_class_mars_param = &_grib_accessor_class_mars_param;
+
+
+void grib_accessor_class_mars_param_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    int n                          = 0;
+    grib_accessor_mars_param_t* self = (grib_accessor_mars_param_t*)a;
+    self->paramId                  = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->table                    = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->param                    = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+}
+
+// For an implementation of pack_string, see
+//   src/deprecated/grib_accessor_class_mars_param.cc
+
+// For an alternative implementation of unpack_string, see
+//   src/deprecated/grib_accessor_class_mars_param.cc
+//
+int grib_accessor_class_mars_param_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    grib_accessor_mars_param_t* self = (grib_accessor_mars_param_t*)a;
+    long param                     = 0;
+    long table                     = 0;
+    int ret                        = 0;
+
+    if (self->table != NULL && (ret = grib_get_long_internal(grib_handle_of_accessor(a), self->table, &table)) != GRIB_SUCCESS)
+        return ret;
+    if (self->param != NULL && (ret = grib_get_long_internal(grib_handle_of_accessor(a), self->param, &param)) != GRIB_SUCCESS)
+        return ret;
+
+    /*if (table==200) table=128;*/
+    snprintf(val, 32, "%ld.%ld", param, table);
+    *len = strlen(val) + 1;
+
+    return GRIB_SUCCESS;
+}
+
+size_t grib_accessor_class_mars_param_t::string_length(grib_accessor* a){
+    return 7;
+}
diff --git a/src/accessor/grib_accessor_class_mars_param.h b/src/accessor/grib_accessor_class_mars_param.h
new file mode 100644
index 000000000..87bcaad41
--- /dev/null
+++ b/src/accessor/grib_accessor_class_mars_param.h
@@ -0,0 +1,36 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_mars_param_h
+#define eccodes_accessor_mars_param_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_ascii.h"
+
+class grib_accessor_mars_param_t : public grib_accessor_ascii_t
+{
+public:
+    /* Members defined in mars_param */
+    const char* paramId;
+    const char* table;
+    const char* param;
+};
+
+class grib_accessor_class_mars_param_t : public grib_accessor_class_ascii_t
+{
+public:
+    grib_accessor_class_mars_param_t(const char* name) : grib_accessor_class_ascii_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_mars_param_t{}; }
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    size_t string_length(grib_accessor*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_mars_param_h */
diff --git a/src/accessor/grib_accessor_class_mars_step.cc b/src/accessor/grib_accessor_class_mars_step.cc
new file mode 100644
index 000000000..05a5120c2
--- /dev/null
+++ b/src/accessor/grib_accessor_class_mars_step.cc
@@ -0,0 +1,115 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_mars_step.h"
+
+grib_accessor_class_mars_step_t _grib_accessor_class_mars_step{"mars_step"};
+grib_accessor_class* grib_accessor_class_mars_step = &_grib_accessor_class_mars_step;
+
+
+void grib_accessor_class_mars_step_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    int n                         = 0;
+    grib_accessor_mars_step_t* self = (grib_accessor_mars_step_t*)a;
+    self->stepRange               = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->stepType                = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+}
+
+int grib_accessor_class_mars_step_t::pack_string(grib_accessor* a, const char* val, size_t* len){
+    char stepType[100];
+    size_t stepTypeLen = 100;
+    char buf[100]      = {0,};
+    int ret;
+    grib_accessor_mars_step_t* self = (grib_accessor_mars_step_t*)a;
+    grib_accessor* stepRangeAcc   = grib_find_accessor(grib_handle_of_accessor(a), self->stepRange);
+
+    if (!stepRangeAcc) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "%s not found", self->stepRange);
+        return GRIB_NOT_FOUND;
+    }
+
+    if ((ret = grib_get_string(grib_handle_of_accessor(a), self->stepType, stepType, &stepTypeLen)) != GRIB_SUCCESS)
+        return ret;
+
+    if (!strcmp(stepType, "instant"))
+        snprintf(buf, sizeof(buf), "%s", val);
+    else
+        snprintf(buf, sizeof(buf), "0-%s", val);
+
+    return stepRangeAcc->pack_string(buf, len);}
+
+int grib_accessor_class_mars_step_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    int ret                       = 0;
+    grib_accessor_mars_step_t* self = (grib_accessor_mars_step_t*)a;
+    char buf[100]                 = {0,};
+    char* p       = NULL;
+    size_t buflen = 100;
+    long step;
+    grib_accessor* stepRangeAcc = grib_find_accessor(grib_handle_of_accessor(a), self->stepRange);
+    const char* cclass_name = a->cclass->name;
+
+    if (!stepRangeAcc) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "%s: %s not found", cclass_name, self->stepRange);
+        return GRIB_NOT_FOUND;
+    }
+
+    if ((ret = stepRangeAcc->unpack_string(buf, &buflen)) != GRIB_SUCCESS)
+        return ret;
+
+    if (*len < buflen) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
+                         cclass_name, a->name, buflen, *len);
+        *len = buflen;
+        return GRIB_BUFFER_TOO_SMALL;
+    }
+
+    strcpy(val, buf);
+    step = strtol(buf, &p, 10);
+
+    if (p != NULL && *p == '-' && step == 0)
+        strcpy(val, ++p);
+
+    *len = strlen(val);
+
+    return ret;
+}
+
+int grib_accessor_class_mars_step_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    char buff[100] = {0,};
+    size_t bufflen = 100;
+
+    snprintf(buff, sizeof(buff), "%ld", *val);
+
+    return pack_string(a, buff, &bufflen);
+}
+
+int grib_accessor_class_mars_step_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_mars_step_t* self = (grib_accessor_mars_step_t*)a;
+    grib_accessor* stepRangeAcc   = grib_find_accessor(grib_handle_of_accessor(a), self->stepRange);
+
+    if (!stepRangeAcc)
+        return GRIB_NOT_FOUND;
+
+    return stepRangeAcc->unpack_long(val, len);}
+
+int grib_accessor_class_mars_step_t::value_count(grib_accessor* a, long* count){
+    *count = 1;
+    return 0;
+}
+
+size_t grib_accessor_class_mars_step_t::string_length(grib_accessor* a){
+    return 16;
+}
+
+int grib_accessor_class_mars_step_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_LONG;
+}
diff --git a/src/accessor/grib_accessor_class_mars_step.h b/src/accessor/grib_accessor_class_mars_step.h
new file mode 100644
index 000000000..db3042648
--- /dev/null
+++ b/src/accessor/grib_accessor_class_mars_step.h
@@ -0,0 +1,40 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_mars_step_h
+#define eccodes_accessor_mars_step_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_ascii.h"
+
+class grib_accessor_mars_step_t : public grib_accessor_ascii_t
+{
+public:
+    /* Members defined in mars_step */
+    const char* stepRange;
+    const char* stepType;
+};
+
+class grib_accessor_class_mars_step_t : public grib_accessor_class_ascii_t
+{
+public:
+    grib_accessor_class_mars_step_t(const char* name) : grib_accessor_class_ascii_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_mars_step_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int pack_string(grib_accessor*, const char*, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    size_t string_length(grib_accessor*) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_mars_step_h */
diff --git a/src/accessor/todo/grib_accessor_class_md5.cc b/src/accessor/grib_accessor_class_md5.cc
similarity index 51%
rename from src/accessor/todo/grib_accessor_class_md5.cc
rename to src/accessor/grib_accessor_class_md5.cc
index 6a57c1329..f19836aea 100644
--- a/src/accessor/todo/grib_accessor_class_md5.cc
+++ b/src/accessor/grib_accessor_class_md5.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,107 +10,15 @@
  */
 
 #include "grib_api_internal.h"
+#include "grib_accessor_class_md5.h"
 #include "md5.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = get_native_type;init
-   IMPLEMENTS = compare;unpack_string;value_count;destroy
-   MEMBERS = const char* offset
-   MEMBERS = grib_expression* length
-   MEMBERS = grib_string_list* blocklist
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void destroy(grib_context*, grib_accessor*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static int compare(grib_accessor*, grib_accessor*);
-
-typedef struct grib_accessor_md5
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in md5 */
-    const char* offset;
-    grib_expression* length;
-    grib_string_list* blocklist;
-} grib_accessor_md5;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_md5 = {
-    &grib_accessor_class_gen,                      /* super */
-    "md5",                      /* name */
-    sizeof(grib_accessor_md5),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    &destroy,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    &compare,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
 
+grib_accessor_class_md5_t _grib_accessor_class_md5{"md5"};
 grib_accessor_class* grib_accessor_class_md5 = &_grib_accessor_class_md5;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    grib_accessor_md5* self   = (grib_accessor_md5*)a;
+void grib_accessor_class_md5_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    grib_accessor_md5_t* self   = (grib_accessor_md5_t*)a;
     char* b                   = 0;
     int n                     = 0;
     grib_string_list* current = 0;
@@ -138,13 +47,11 @@ static void init(grib_accessor* a, const long len, grib_arguments* arg)
     a->flags |= GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC;
 }
 
-static int get_native_type(grib_accessor* a)
-{
+int grib_accessor_class_md5_t::get_native_type(grib_accessor* a){
     return GRIB_TYPE_STRING;
 }
 
-static int compare(grib_accessor* a, grib_accessor* b)
-{
+int grib_accessor_class_md5_t::compare(grib_accessor* a, grib_accessor* b){
     int retval = GRIB_SUCCESS;
 
     size_t alen = 0;
@@ -152,13 +59,11 @@ static int compare(grib_accessor* a, grib_accessor* b)
     int err     = 0;
     long count  = 0;
 
-    err = grib_value_count(a, &count);
-    if (err)
+    err = a->value_count(&count);    if (err)
         return err;
     alen = count;
 
-    err = grib_value_count(b, &count);
-    if (err)
+    err = b->value_count(&count);    if (err)
         return err;
     blen = count;
 
@@ -168,9 +73,8 @@ static int compare(grib_accessor* a, grib_accessor* b)
     return retval;
 }
 
-static int unpack_string(grib_accessor* a, char* v, size_t* len)
-{
-    grib_accessor_md5* self = (grib_accessor_md5*)a;
+int grib_accessor_class_md5_t::unpack_string(grib_accessor* a, char* v, size_t* len){
+    grib_accessor_md5_t* self = (grib_accessor_md5_t*)a;
     unsigned mess_len;
     unsigned char* mess;
     unsigned char* p;
@@ -226,9 +130,8 @@ static int unpack_string(grib_accessor* a, char* v, size_t* len)
     return ret;
 }
 
-static void destroy(grib_context* c, grib_accessor* a)
-{
-    grib_accessor_md5* self = (grib_accessor_md5*)a;
+void grib_accessor_class_md5_t::destroy(grib_context* c, grib_accessor* a){
+    grib_accessor_md5_t* self = (grib_accessor_md5_t*)a;
     if (self->blocklist) {
         grib_string_list* next = self->blocklist;
         grib_string_list* cur  = NULL;
@@ -241,8 +144,7 @@ static void destroy(grib_context* c, grib_accessor* a)
     }
 }
 
-static int value_count(grib_accessor* a, long* count)
-{
+int grib_accessor_class_md5_t::value_count(grib_accessor* a, long* count){
     *count = 1; /* ECC-1475 */
     return 0;
 }
diff --git a/src/accessor/grib_accessor_class_md5.h b/src/accessor/grib_accessor_class_md5.h
new file mode 100644
index 000000000..8d819cc9d
--- /dev/null
+++ b/src/accessor/grib_accessor_class_md5.h
@@ -0,0 +1,39 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_md5_h
+#define eccodes_accessor_md5_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_md5_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in md5 */
+    const char* offset;
+    grib_expression* length;
+    grib_string_list* blocklist;
+};
+
+class grib_accessor_class_md5_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_md5_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_md5_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void destroy(grib_context*, grib_accessor*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    int compare(grib_accessor*, grib_accessor*) override;
+};
+#endif /* eccodes_accessor_md5_h */
diff --git a/src/accessor/grib_accessor_class_message.cc b/src/accessor/grib_accessor_class_message.cc
new file mode 100644
index 000000000..76fcb7be7
--- /dev/null
+++ b/src/accessor/grib_accessor_class_message.cc
@@ -0,0 +1,75 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_message.h"
+
+grib_accessor_class_message_t _grib_accessor_class_message{"message"};
+grib_accessor_class* grib_accessor_class_message = &_grib_accessor_class_message;
+
+
+
+void grib_accessor_class_message_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    a->flags |= GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC;
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->length = grib_handle_of_accessor(a)->buffer->ulength - len - a->offset;
+}
+
+// static int compare(grib_accessor* a, grib_accessor* b)
+// {
+//     if (a->length != b->length)
+//         return GRIB_COUNT_MISMATCH;
+//     return GRIB_SUCCESS;
+// }
+
+void grib_accessor_class_message_t::update_size(grib_accessor* a, size_t new_size){
+    a->length = new_size;
+}
+
+void grib_accessor_class_message_t::resize(grib_accessor* a, size_t new_size){
+    grib_context_log(a->context, GRIB_LOG_FATAL, "%s %s: Not supported", a->cclass->name, __func__);
+
+    // void* zero = grib_context_malloc_clear(a->context, new_size);
+    // grib_buffer_replace(a, (const unsigned char*)zero, new_size, 1, 0);
+    // grib_context_free(a->context, zero);
+    // grib_context_log(a->context, GRIB_LOG_DEBUG, "resize: grib_accessor_class_message %ld %ld %s %s",
+    //                 (long)new_size, (long)a->length, a->cclass->name, a->name);
+    // Assert(new_size == a->length);
+}
+
+int grib_accessor_class_message_t::value_count(grib_accessor* a, long* count){
+    *count = 1;
+    return 0;
+}
+
+int grib_accessor_class_message_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    long i = 0;
+    size_t l = string_length(a) + 1;
+    grib_handle* h = grib_handle_of_accessor(a);
+
+    if (*len < l) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
+                         a->cclass->name, a->name, l, *len);
+        *len = l;
+        return GRIB_BUFFER_TOO_SMALL;
+    }
+
+    for (i = 0; i < a->length; i++)
+        val[i] = h->buffer->data[a->offset + i];
+    val[i] = 0;
+    *len = i;
+    return GRIB_SUCCESS;
+}
+
+size_t grib_accessor_class_message_t::string_length(grib_accessor* a){
+    return a->length;
+}
diff --git a/src/accessor/grib_accessor_class_message.h b/src/accessor/grib_accessor_class_message.h
new file mode 100644
index 000000000..912e8be4b
--- /dev/null
+++ b/src/accessor/grib_accessor_class_message.h
@@ -0,0 +1,36 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_message_h
+#define eccodes_accessor_message_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_bytes.h"
+
+class grib_accessor_message_t : public grib_accessor_bytes_t
+{
+public:
+    /* Members defined in message */
+};
+
+class grib_accessor_class_message_t : public grib_accessor_class_bytes_t
+{
+public:
+    grib_accessor_class_message_t(const char* name) : grib_accessor_class_bytes_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_message_t{}; }
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    size_t string_length(grib_accessor*) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    void update_size(grib_accessor*, size_t) override;
+    void resize(grib_accessor*,size_t) override;
+};
+#endif /* eccodes_accessor_message_h */
diff --git a/src/accessor/grib_accessor_class_message_copy.cc b/src/accessor/grib_accessor_class_message_copy.cc
new file mode 100644
index 000000000..e32d39355
--- /dev/null
+++ b/src/accessor/grib_accessor_class_message_copy.cc
@@ -0,0 +1,59 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_message_copy.h"
+
+grib_accessor_class_message_copy_t _grib_accessor_class_message_copy{"message_copy"};
+grib_accessor_class* grib_accessor_class_message_copy = &_grib_accessor_class_message_copy;
+
+
+void grib_accessor_class_message_copy_t::init(grib_accessor* a, const long length, grib_arguments* args){
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->length = 0;
+}
+
+void grib_accessor_class_message_copy_t::dump(grib_accessor* a, grib_dumper* dumper){
+    grib_dump_string(dumper, a, NULL);
+}
+
+int grib_accessor_class_message_copy_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_STRING;
+}
+
+int grib_accessor_class_message_copy_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    size_t slen = grib_handle_of_accessor(a)->buffer->ulength;
+    size_t i;
+    unsigned char* v = 0;
+
+    if (*len < slen) {
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+    v = grib_handle_of_accessor(a)->buffer->data;
+    /* replace unprintable characters with space */
+    for (i = 0; i < slen; i++)
+        if (v[i] > 126)
+            v[i] = 32;
+    memcpy(val, grib_handle_of_accessor(a)->buffer->data, slen);
+    val[i] = 0;
+
+    *len = slen;
+
+    return GRIB_SUCCESS;
+}
+
+size_t grib_accessor_class_message_copy_t::string_length(grib_accessor* a){
+    return grib_handle_of_accessor(a)->buffer->ulength;
+}
+
+long grib_accessor_class_message_copy_t::byte_count(grib_accessor* a){
+    return a->length;
+}
diff --git a/src/accessor/grib_accessor_class_message_copy.h b/src/accessor/grib_accessor_class_message_copy.h
new file mode 100644
index 000000000..37072c685
--- /dev/null
+++ b/src/accessor/grib_accessor_class_message_copy.h
@@ -0,0 +1,36 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_message_copy_h
+#define eccodes_accessor_message_copy_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_message_copy_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in message_copy */
+};
+
+class grib_accessor_class_message_copy_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_message_copy_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_message_copy_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    size_t string_length(grib_accessor*) override;
+    long byte_count(grib_accessor*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_message_copy_h */
diff --git a/src/accessor/grib_accessor_class_multdouble.cc b/src/accessor/grib_accessor_class_multdouble.cc
new file mode 100644
index 000000000..3b8b42bd5
--- /dev/null
+++ b/src/accessor/grib_accessor_class_multdouble.cc
@@ -0,0 +1,40 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_multdouble.h"
+
+grib_accessor_class_multdouble_t _grib_accessor_class_multdouble{"multdouble"};
+grib_accessor_class* grib_accessor_class_multdouble = &_grib_accessor_class_multdouble;
+
+
+void grib_accessor_class_multdouble_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_multdouble_t* self = (grib_accessor_multdouble_t*)a;
+    int n = 0;
+
+    self->val = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->multiplier = grib_arguments_get_double(grib_handle_of_accessor(a), c, n++);
+}
+
+int grib_accessor_class_multdouble_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    const grib_accessor_multdouble_t* self = (grib_accessor_multdouble_t*)a;
+    int ret = GRIB_SUCCESS;
+    double value = 0;
+
+    ret = grib_get_double_internal(grib_handle_of_accessor(a), self->val, &value);
+    if (ret != GRIB_SUCCESS)
+        return ret;
+
+    *val = value * self->multiplier;
+
+    *len = 1;
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_multdouble.h b/src/accessor/grib_accessor_class_multdouble.h
new file mode 100644
index 000000000..9d6d76285
--- /dev/null
+++ b/src/accessor/grib_accessor_class_multdouble.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_multdouble_h
+#define eccodes_accessor_multdouble_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_double.h"
+
+class grib_accessor_multdouble_t : public grib_accessor_double_t
+{
+public:
+    /* Members defined in multdouble */
+    const char* val;
+    double multiplier;
+};
+
+class grib_accessor_class_multdouble_t : public grib_accessor_class_double_t
+{
+public:
+    grib_accessor_class_multdouble_t(const char* name) : grib_accessor_class_double_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_multdouble_t{}; }
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_multdouble_h */
diff --git a/src/accessor/grib_accessor_class_non_alpha.cc b/src/accessor/grib_accessor_class_non_alpha.cc
new file mode 100644
index 000000000..05f8ca01c
--- /dev/null
+++ b/src/accessor/grib_accessor_class_non_alpha.cc
@@ -0,0 +1,112 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_non_alpha.h"
+
+grib_accessor_class_non_alpha_t _grib_accessor_class_non_alpha{"non_alpha"};
+grib_accessor_class* grib_accessor_class_non_alpha = &_grib_accessor_class_non_alpha;
+
+
+void grib_accessor_class_non_alpha_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    grib_buffer* buffer = grib_handle_of_accessor(a)->buffer;
+    size_t i            = 0;
+    unsigned char* v;
+
+    v = buffer->data + a->offset;
+    i = 0;
+    while ((*v < 33 || *v > 126) && i <= buffer->ulength) {
+        v++;
+        i++;
+    }
+    a->length = i;
+
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+}
+
+int grib_accessor_class_non_alpha_t::value_count(grib_accessor* a, long* count){
+    *count = 1;
+    return 0;
+}
+
+size_t grib_accessor_class_non_alpha_t::string_length(grib_accessor* a){
+    return a->length;
+}
+
+void grib_accessor_class_non_alpha_t::dump(grib_accessor* a, grib_dumper* dumper){
+    grib_dump_string(dumper, a, NULL);
+}
+
+int grib_accessor_class_non_alpha_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_STRING;
+}
+
+int grib_accessor_class_non_alpha_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    grib_handle* hand = grib_handle_of_accessor(a);
+    long i = 0;
+
+    if (*len < (a->length + 1)) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "unpack_string: Wrong size (%lu) for %s, it contains %ld values",
+                *len, a->name, a->length + 1);
+        *len = a->length + 1;
+        return GRIB_BUFFER_TOO_SMALL;
+    }
+
+    for (i = 0; i < a->length; i++) {
+        val[i] = hand->buffer->data[a->offset + i];
+    }
+    val[i] = 0;
+    *len = i;
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_non_alpha_t::unpack_long(grib_accessor* a, long* v, size_t* len){
+    char val[1024] = {0,};
+    size_t l   = sizeof(val);
+    size_t i   = 0;
+    char* last = NULL;
+    int err    = a->unpack_string(val, &l);
+    if (err)
+        return err;
+
+    i = 0;
+    while (i < l - 1 && val[i] == ' ')
+        i++;
+
+    if (val[i] == 0) {
+        *v = 0;
+        return 0;
+    }
+    if (val[i + 1] == ' ' && i < l - 2)
+        val[i + 1] = 0;
+
+    *v = strtol(val, &last, 10);
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_non_alpha_t::unpack_double(grib_accessor* a, double* v, size_t* len){
+    char val[1024];
+    size_t l   = sizeof(val);
+    char* last = NULL;
+    a->unpack_string(val, &l);
+    *v = strtod(val, &last);
+
+    if (*last == 0) {
+        return GRIB_SUCCESS;
+    }
+
+    return GRIB_NOT_IMPLEMENTED;
+}
+
+long grib_accessor_class_non_alpha_t::next_offset(grib_accessor* a){
+    return a->offset + a->length;
+}
diff --git a/src/accessor/grib_accessor_class_non_alpha.h b/src/accessor/grib_accessor_class_non_alpha.h
new file mode 100644
index 000000000..1b1b9d830
--- /dev/null
+++ b/src/accessor/grib_accessor_class_non_alpha.h
@@ -0,0 +1,39 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_non_alpha_h
+#define eccodes_accessor_non_alpha_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_non_alpha_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in non_alpha */
+};
+
+class grib_accessor_class_non_alpha_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_non_alpha_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_non_alpha_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    size_t string_length(grib_accessor*) override;
+    long next_offset(grib_accessor*) override;
+    int value_count(grib_accessor*, long*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_non_alpha_h */
diff --git a/src/accessor/grib_accessor_class_number_of_coded_values.cc b/src/accessor/grib_accessor_class_number_of_coded_values.cc
new file mode 100644
index 000000000..b77769898
--- /dev/null
+++ b/src/accessor/grib_accessor_class_number_of_coded_values.cc
@@ -0,0 +1,66 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_number_of_coded_values.h"
+
+grib_accessor_class_number_of_coded_values_t _grib_accessor_class_number_of_coded_values{"number_of_coded_values"};
+grib_accessor_class* grib_accessor_class_number_of_coded_values = &_grib_accessor_class_number_of_coded_values;
+
+
+void grib_accessor_class_number_of_coded_values_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    int n                                      = 0;
+    grib_accessor_number_of_coded_values_t* self = (grib_accessor_number_of_coded_values_t*)a;
+    self->bitsPerValue                         = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->offsetBeforeData                     = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->offsetAfterData                      = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->unusedBits                           = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->numberOfValues                       = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
+    a->length = 0;
+}
+
+int grib_accessor_class_number_of_coded_values_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    int ret               = GRIB_SUCCESS;
+    long bpv              = 0;
+    long offsetBeforeData = 0, offsetAfterData = 0, unusedBits = 0, numberOfValues;
+
+    grib_accessor_number_of_coded_values_t* self = (grib_accessor_number_of_coded_values_t*)a;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->bitsPerValue, &bpv)) != GRIB_SUCCESS)
+        return ret;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->offsetBeforeData, &offsetBeforeData)) != GRIB_SUCCESS)
+        return ret;
+
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->offsetAfterData, &offsetAfterData)) != GRIB_SUCCESS)
+        return ret;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->unusedBits, &unusedBits)) != GRIB_SUCCESS)
+        return ret;
+
+    if (bpv != 0) {
+        grib_context_log(a->context, GRIB_LOG_DEBUG, "grib_accessor_number_of_coded_values_t: offsetAfterData=%ld offsetBeforeData=%ld unusedBits=%ld bpv=%ld\n",
+                         offsetAfterData, offsetBeforeData, unusedBits, bpv);
+        DEBUG_ASSERT(offsetAfterData > offsetBeforeData);
+        *val = ((offsetAfterData - offsetBeforeData) * 8 - unusedBits) / bpv;
+    }
+    else {
+        if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->numberOfValues, &numberOfValues)) != GRIB_SUCCESS)
+            return ret;
+
+        *val = numberOfValues;
+    }
+
+    return ret;
+}
diff --git a/src/accessor/grib_accessor_class_number_of_coded_values.h b/src/accessor/grib_accessor_class_number_of_coded_values.h
new file mode 100644
index 000000000..de5e3b76b
--- /dev/null
+++ b/src/accessor/grib_accessor_class_number_of_coded_values.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_number_of_coded_values_h
+#define eccodes_accessor_number_of_coded_values_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_number_of_coded_values_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in number_of_coded_values */
+    const char* numberOfValues;
+    const char* bitsPerValue;
+    const char* offsetBeforeData;
+    const char* offsetAfterData;
+    const char* unusedBits;
+};
+
+class grib_accessor_class_number_of_coded_values_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_number_of_coded_values_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_number_of_coded_values_t{}; }
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_number_of_coded_values_h */
diff --git a/src/accessor/grib_accessor_class_number_of_points.cc b/src/accessor/grib_accessor_class_number_of_points.cc
new file mode 100644
index 000000000..abd4af786
--- /dev/null
+++ b/src/accessor/grib_accessor_class_number_of_points.cc
@@ -0,0 +1,80 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_number_of_points.h"
+
+grib_accessor_class_number_of_points_t _grib_accessor_class_number_of_points{"number_of_points"};
+grib_accessor_class* grib_accessor_class_number_of_points = &_grib_accessor_class_number_of_points;
+
+
+void grib_accessor_class_number_of_points_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    int n = 0;
+    grib_handle* hand = grib_handle_of_accessor(a);
+
+    grib_accessor_number_of_points_t* self = (grib_accessor_number_of_points_t*)a;
+    self->ni                             = grib_arguments_get_name(hand, c, n++);
+    self->nj                             = grib_arguments_get_name(hand, c, n++);
+    self->plpresent                      = grib_arguments_get_name(hand, c, n++);
+    self->pl                             = grib_arguments_get_name(hand, c, n++);
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
+    a->length = 0;
+}
+
+int grib_accessor_class_number_of_points_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_number_of_points_t* self = (grib_accessor_number_of_points_t*)a;
+
+    int ret = GRIB_SUCCESS;
+    long ni = 0, nj = 0, plpresent = 0;
+    size_t plsize = 0;
+    long* pl = NULL;
+    int i = 0;
+    grib_context* c = a->context;
+    grib_handle* hand = grib_handle_of_accessor(a);
+
+    if ((ret = grib_get_long_internal(hand, self->ni, &ni)) != GRIB_SUCCESS)
+        return ret;
+
+    if ((ret = grib_get_long_internal(hand, self->nj, &nj)) != GRIB_SUCCESS)
+        return ret;
+
+    if (self->plpresent &&
+        ((ret = grib_get_long_internal(hand, self->plpresent, &plpresent)) != GRIB_SUCCESS))
+        return ret;
+
+    if (grib_is_missing(hand, self->nj, &ret) && ret == GRIB_SUCCESS) {
+        grib_context_log(c, GRIB_LOG_ERROR, "grib_accessor_class_number_of_points: Key %s cannot be 'missing'!", self->nj);
+        return GRIB_GEOCALCULUS_PROBLEM;
+    }
+
+    if (nj == 0) {
+        grib_context_log(c, GRIB_LOG_ERROR, "grib_accessor_class_number_of_points: Key %s cannot be 0!", self->nj);
+        return GRIB_GEOCALCULUS_PROBLEM;
+    }
+
+    if (plpresent) {
+        /*reduced*/
+        plsize = nj;
+        pl     = (long*)grib_context_malloc(c, sizeof(long) * plsize);
+        grib_get_long_array_internal(hand, self->pl, pl, &plsize);
+        *val = 0;
+        for (i = 0; i < plsize; i++)
+            *val += pl[i];
+        grib_context_free(c, pl);
+    }
+    else {
+        /*regular*/
+        *val = ni * nj;
+    }
+
+    return ret;
+}
diff --git a/src/accessor/grib_accessor_class_number_of_points.h b/src/accessor/grib_accessor_class_number_of_points.h
new file mode 100644
index 000000000..db3521c05
--- /dev/null
+++ b/src/accessor/grib_accessor_class_number_of_points.h
@@ -0,0 +1,36 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_number_of_points_h
+#define eccodes_accessor_number_of_points_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_number_of_points_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in number_of_points */
+    const char* ni;
+    const char* nj;
+    const char* plpresent;
+    const char* pl;
+};
+
+class grib_accessor_class_number_of_points_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_number_of_points_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_number_of_points_t{}; }
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_number_of_points_h */
diff --git a/src/accessor/todo/grib_accessor_class_number_of_points_gaussian.cc b/src/accessor/grib_accessor_class_number_of_points_gaussian.cc
similarity index 72%
rename from src/accessor/todo/grib_accessor_class_number_of_points_gaussian.cc
rename to src/accessor/grib_accessor_class_number_of_points_gaussian.cc
index 2114a9c87..c7fd4e4b8 100644
--- a/src/accessor/todo/grib_accessor_class_number_of_points_gaussian.cc
+++ b/src/accessor/grib_accessor_class_number_of_points_gaussian.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,127 +9,19 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-/**************************************
- * Enrico Fucile
- ************************************/
-
 #include "grib_api_internal.h"
+#include "grib_accessor_class_number_of_points_gaussian.h"
 
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = init
-   MEMBERS = const char* ni
-   MEMBERS = const char* nj
-   MEMBERS = const char* plpresent
-   MEMBERS = const char* pl
-   MEMBERS = const char* order
-   MEMBERS = const char* lat_first
-   MEMBERS = const char* lon_first
-   MEMBERS = const char* lat_last
-   MEMBERS = const char* lon_last
-   MEMBERS = const char* support_legacy
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_number_of_points_gaussian
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in number_of_points_gaussian */
-    const char* ni;
-    const char* nj;
-    const char* plpresent;
-    const char* pl;
-    const char* order;
-    const char* lat_first;
-    const char* lon_first;
-    const char* lat_last;
-    const char* lon_last;
-    const char* support_legacy;
-} grib_accessor_number_of_points_gaussian;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_number_of_points_gaussian = {
-    &grib_accessor_class_long,                      /* super */
-    "number_of_points_gaussian",                      /* name */
-    sizeof(grib_accessor_number_of_points_gaussian),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
+grib_accessor_class_number_of_points_gaussian_t _grib_accessor_class_number_of_points_gaussian{"number_of_points_gaussian"};
 grib_accessor_class* grib_accessor_class_number_of_points_gaussian = &_grib_accessor_class_number_of_points_gaussian;
 
-/* END_CLASS_IMP */
 
 #define EFDEBUG 0
 
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
+void grib_accessor_class_number_of_points_gaussian_t::init(grib_accessor* a, const long l, grib_arguments* c){
     int n                                         = 0;
     grib_handle* h                                = grib_handle_of_accessor(a);
-    grib_accessor_number_of_points_gaussian* self = (grib_accessor_number_of_points_gaussian*)a;
+    grib_accessor_number_of_points_gaussian_t* self = (grib_accessor_number_of_points_gaussian_t*)a;
     self->ni                                      = grib_arguments_get_name(h, c, n++);
     self->nj                                      = grib_arguments_get_name(h, c, n++);
     self->plpresent                               = grib_arguments_get_name(h, c, n++);
@@ -148,13 +41,11 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
 // See src/deprecated/grib_accessor_class_number_of_points_gaussian.cc
 //
 
-static int angleApproximatelyEqual(double A, double B, double angular_precision)
-{
+int angleApproximatelyEqual(double A, double B, double angular_precision){
     return angular_precision > 0 ? (fabs(A - B) <= angular_precision) : (A == B);
 }
 
-static double longitude_normalise(double lon, double minimum)
-{
+double longitude_normalise(double lon, double minimum){
     while (lon < minimum) {
         lon += 360;
     }
@@ -164,8 +55,7 @@ static double longitude_normalise(double lon, double minimum)
     return lon;
 }
 
-static void correctWestEast(long max_pl, double angular_precision, double* pWest, double* pEast)
-{
+void correctWestEast(long max_pl, double angular_precision, double* pWest, double* pEast){
     double w, e;
     const double inc = 360.0 / max_pl; /*smallest increment*/
     if (*pWest > *pEast)
@@ -186,8 +76,7 @@ static void correctWestEast(long max_pl, double angular_precision, double* pWest
     }
 }
 
-static int get_number_of_data_values(grib_handle* h, size_t* numDataValues)
-{
+int get_number_of_data_values(grib_handle* h, size_t* numDataValues){
     int err  = 0;
     long bpv = 0, bitmapPresent = 0;
     size_t bitmapLength = 0;
@@ -218,14 +107,13 @@ static int get_number_of_data_values(grib_handle* h, size_t* numDataValues)
     return err;
 }
 
-static int unpack_long_with_legacy_support(grib_accessor* a, long* val, size_t* len);
-static int unpack_long_new(grib_accessor* a, long* val, size_t* len);
+int unpack_long_with_legacy_support(grib_accessor* a, long* val, size_t* len);
+int unpack_long_new(grib_accessor* a, long* val, size_t* len);
 
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
+int grib_accessor_class_number_of_points_gaussian_t::unpack_long(grib_accessor* a, long* val, size_t* len){
     int err                                       = GRIB_SUCCESS;
     long support_legacy                           = 1;
-    grib_accessor_number_of_points_gaussian* self = (grib_accessor_number_of_points_gaussian*)a;
+    grib_accessor_number_of_points_gaussian_t* self = (grib_accessor_number_of_points_gaussian_t*)a;
     grib_handle* h                                = grib_handle_of_accessor(a);
 
     if ((err = grib_get_long_internal(h, self->support_legacy, &support_legacy)) != GRIB_SUCCESS)
@@ -238,8 +126,7 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
 }
 
 /* New algorithm */
-static int unpack_long_new(grib_accessor* a, long* val, size_t* len)
-{
+int unpack_long_new(grib_accessor* a, long* val, size_t* len){
     int err       = GRIB_SUCCESS;
     int is_global = 0;
     long ni = 0, nj = 0, plpresent = 0, order = 0;
@@ -253,7 +140,7 @@ static int unpack_long_new(grib_accessor* a, long* val, size_t* len)
     long angleSubdivisions   = 0;
     grib_handle* h           = grib_handle_of_accessor(a);
 
-    grib_accessor_number_of_points_gaussian* self = (grib_accessor_number_of_points_gaussian*)a;
+    grib_accessor_number_of_points_gaussian_t* self = (grib_accessor_number_of_points_gaussian_t*)a;
     grib_context* c                               = a->context;
 
     if ((err = grib_get_long_internal(h, self->ni, &ni)) != GRIB_SUCCESS)
@@ -347,8 +234,7 @@ static int unpack_long_new(grib_accessor* a, long* val, size_t* len)
 }
 
 /* With Legacy support */
-static int unpack_long_with_legacy_support(grib_accessor* a, long* val, size_t* len)
-{
+int unpack_long_with_legacy_support(grib_accessor* a, long* val, size_t* len){
     int err       = GRIB_SUCCESS;
     int is_global = 0;
     long ni = 0, nj = 0, plpresent = 0, order = 0;
@@ -363,7 +249,7 @@ static int unpack_long_with_legacy_support(grib_accessor* a, long* val, size_t*
     grib_handle* h           = grib_handle_of_accessor(a);
     size_t numDataValues     = 0;
 
-    grib_accessor_number_of_points_gaussian* self = (grib_accessor_number_of_points_gaussian*)a;
+    grib_accessor_number_of_points_gaussian_t* self = (grib_accessor_number_of_points_gaussian_t*)a;
     grib_context* c                               = a->context;
 
     if ((err = grib_get_long_internal(h, self->ni, &ni)) != GRIB_SUCCESS)
diff --git a/src/accessor/grib_accessor_class_number_of_points_gaussian.h b/src/accessor/grib_accessor_class_number_of_points_gaussian.h
new file mode 100644
index 000000000..f01224f17
--- /dev/null
+++ b/src/accessor/grib_accessor_class_number_of_points_gaussian.h
@@ -0,0 +1,42 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_number_of_points_gaussian_h
+#define eccodes_accessor_number_of_points_gaussian_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_number_of_points_gaussian_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in number_of_points_gaussian */
+    const char* ni;
+    const char* nj;
+    const char* plpresent;
+    const char* pl;
+    const char* order;
+    const char* lat_first;
+    const char* lon_first;
+    const char* lat_last;
+    const char* lon_last;
+    const char* support_legacy;
+};
+
+class grib_accessor_class_number_of_points_gaussian_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_number_of_points_gaussian_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_number_of_points_gaussian_t{}; }
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_number_of_points_gaussian_h */
diff --git a/src/accessor/grib_accessor_class_number_of_values.cc b/src/accessor/grib_accessor_class_number_of_values.cc
new file mode 100644
index 000000000..3472eb68d
--- /dev/null
+++ b/src/accessor/grib_accessor_class_number_of_values.cc
@@ -0,0 +1,67 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_number_of_values.h"
+
+grib_accessor_class_number_of_values_t _grib_accessor_class_number_of_values{"number_of_values"};
+grib_accessor_class* grib_accessor_class_number_of_values = &_grib_accessor_class_number_of_values;
+
+
+void grib_accessor_class_number_of_values_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    int n                                = 0;
+    grib_accessor_number_of_values_t* self = (grib_accessor_number_of_values_t*)a;
+    grib_handle* hand                    = grib_handle_of_accessor(a);
+
+    self->values              = grib_arguments_get_name(hand, c, n++);
+    self->bitsPerValue        = grib_arguments_get_name(hand, c, n++);
+    self->numberOfPoints      = grib_arguments_get_name(hand, c, n++);
+    self->bitmapPresent       = grib_arguments_get_name(hand, c, n++);
+    self->bitmap              = grib_arguments_get_name(hand, c, n++);
+    self->numberOfCodedValues = grib_arguments_get_name(hand, c, n++);
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+
+    a->length = 0;
+}
+
+int grib_accessor_class_number_of_values_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_number_of_values_t* self = (grib_accessor_number_of_values_t*)a;
+    int ret                              = GRIB_SUCCESS, i;
+    long npoints = 0, bitmap_present = 0;
+    size_t size = 0;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->numberOfPoints, &npoints)) != GRIB_SUCCESS)
+        return ret;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->bitmapPresent, &bitmap_present)) != GRIB_SUCCESS)
+        return ret;
+
+    if (bitmap_present) {
+        double* bitmap;
+        size   = npoints;
+        bitmap = (double*)grib_context_malloc(a->context, sizeof(double) * size);
+        if ((ret = grib_get_double_array_internal(grib_handle_of_accessor(a), self->bitmap, bitmap, &size)) != GRIB_SUCCESS) {
+            grib_context_free(a->context, bitmap);
+            return ret;
+        }
+        *val = 0;
+        for (i = 0; i < size; i++)
+            if (bitmap[i] != 0)
+                (*val)++;
+
+        grib_context_free(a->context, bitmap);
+    }
+    else {
+        *val = npoints;
+    }
+
+    return ret;
+}
diff --git a/src/accessor/grib_accessor_class_number_of_values.h b/src/accessor/grib_accessor_class_number_of_values.h
new file mode 100644
index 000000000..88b18cd6f
--- /dev/null
+++ b/src/accessor/grib_accessor_class_number_of_values.h
@@ -0,0 +1,38 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_number_of_values_h
+#define eccodes_accessor_number_of_values_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_number_of_values_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in number_of_values */
+    const char* values;
+    const char* bitsPerValue;
+    const char* numberOfPoints;
+    const char* bitmapPresent;
+    const char* bitmap;
+    const char* numberOfCodedValues;
+};
+
+class grib_accessor_class_number_of_values_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_number_of_values_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_number_of_values_t{}; }
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_number_of_values_h */
diff --git a/src/accessor/grib_accessor_class_number_of_values_data_raw_packing.cc b/src/accessor/grib_accessor_class_number_of_values_data_raw_packing.cc
new file mode 100644
index 000000000..ecfe11b22
--- /dev/null
+++ b/src/accessor/grib_accessor_class_number_of_values_data_raw_packing.cc
@@ -0,0 +1,63 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_number_of_values_data_raw_packing.h"
+
+grib_accessor_class_number_of_values_data_raw_packing_t _grib_accessor_class_number_of_values_data_raw_packing{"number_of_values_data_raw_packing"};
+grib_accessor_class* grib_accessor_class_number_of_values_data_raw_packing = &_grib_accessor_class_number_of_values_data_raw_packing;
+
+
+void grib_accessor_class_number_of_values_data_raw_packing_t::init(grib_accessor* a, const long v, grib_arguments* args){
+    int n                                                 = 0;
+    grib_accessor_number_of_values_data_raw_packing_t* self = (grib_accessor_number_of_values_data_raw_packing_t*)a;
+
+    self->values    = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
+    self->precision = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->length = 0;
+}
+
+int grib_accessor_class_number_of_values_data_raw_packing_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    int err                                               = 0;
+    grib_accessor_number_of_values_data_raw_packing_t* self = (grib_accessor_number_of_values_data_raw_packing_t*)a;
+    grib_accessor* adata                                  = NULL;
+    long precision                                        = 0;
+    int bytes                                             = 0;
+    long byte_count                                       = 0;
+
+    adata = grib_find_accessor(grib_handle_of_accessor(a), self->values);
+    Assert(adata != NULL);
+    byte_count = adata->byte_count();
+    if ((err = grib_get_long_internal(grib_handle_of_accessor(a), self->precision, &precision)) != GRIB_SUCCESS)
+        return err;
+
+    switch (precision) {
+        case 1:
+            bytes = 4;
+            break;
+
+        case 2:
+            bytes = 8;
+            break;
+
+        default:
+            return GRIB_NOT_IMPLEMENTED;
+    }
+
+    *val = byte_count / bytes;
+
+    return err;
+}
+
+int grib_accessor_class_number_of_values_data_raw_packing_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_LONG;
+}
diff --git a/src/accessor/grib_accessor_class_number_of_values_data_raw_packing.h b/src/accessor/grib_accessor_class_number_of_values_data_raw_packing.h
new file mode 100644
index 000000000..c0a6e9fcb
--- /dev/null
+++ b/src/accessor/grib_accessor_class_number_of_values_data_raw_packing.h
@@ -0,0 +1,35 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_number_of_values_data_raw_packing_h
+#define eccodes_accessor_number_of_values_data_raw_packing_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_number_of_values_data_raw_packing_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in number_of_values_data_raw_packing */
+    const char*   values;
+    const char*   precision;
+};
+
+class grib_accessor_class_number_of_values_data_raw_packing_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_number_of_values_data_raw_packing_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_number_of_values_data_raw_packing_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_number_of_values_data_raw_packing_h */
diff --git a/src/accessor/grib_accessor_class_octahedral_gaussian.cc b/src/accessor/grib_accessor_class_octahedral_gaussian.cc
new file mode 100644
index 000000000..259f97375
--- /dev/null
+++ b/src/accessor/grib_accessor_class_octahedral_gaussian.cc
@@ -0,0 +1,120 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_octahedral_gaussian.h"
+
+grib_accessor_class_octahedral_gaussian_t _grib_accessor_class_octahedral_gaussian{"octahedral_gaussian"};
+grib_accessor_class* grib_accessor_class_octahedral_gaussian = &_grib_accessor_class_octahedral_gaussian;
+
+
+void grib_accessor_class_octahedral_gaussian_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_octahedral_gaussian_t* self = (grib_accessor_octahedral_gaussian_t*)a;
+    int n                                   = 0;
+    grib_handle* hand                       = grib_handle_of_accessor(a);
+
+    self->N         = grib_arguments_get_name(hand, c, n++);
+    self->Ni        = grib_arguments_get_name(hand, c, n++);
+    self->plpresent = grib_arguments_get_name(hand, c, n++);
+    self->pl        = grib_arguments_get_name(hand, c, n++);
+}
+
+/* Returns 1 (=true) if input pl array is Octahedral, 0 otherwise.
+ * Possible cases for the deltas in an octahedral pl array:
+ *  +4 .. +4        Top part, above equator
+ *  +4 .. 0         Top part, above and including equator
+ *  +4.. 0  -4..    Middle part, above, equator and below
+ *  0 -4..          Equator and below
+ *  -4 ..-4         All below equator
+ * Anything else is considered not octahedral
+ */
+int is_pl_octahedral(const long pl[], size_t size){
+    long i;
+    long prev_diff = -1;
+    for (i = 1; i < size; ++i) {
+        const long diff = pl[i] - pl[i - 1];
+        if (diff == 0) {
+            /* prev must be +4 or undef */
+            if (!(prev_diff == +4 || i == 1)) {
+                return 0;
+            }
+        }
+        else {
+            if (labs(diff) != 4) {
+                return 0;
+            }
+            if (diff == +4) {
+                /* prev must be +4 or undef */
+                if (!(prev_diff == +4 || i == 1)) {
+                    return 0;
+                }
+            }
+            if (diff == -4) {
+                /* prev must be 0, -4 or undef */
+                if (!(prev_diff == -4 || prev_diff == 0 || i == 1)) {
+                    return 0;
+                }
+            }
+        }
+        prev_diff = diff;
+    }
+    return 1; /* it's octahedral */
+}
+
+int grib_accessor_class_octahedral_gaussian_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_octahedral_gaussian_t* self = (grib_accessor_octahedral_gaussian_t*)a;
+    int ret                                 = GRIB_SUCCESS;
+    long Ni;
+    long plpresent    = 0;
+    long* pl          = NULL; /* pl array */
+    size_t plsize     = 0;
+    grib_handle* hand = grib_handle_of_accessor(a);
+
+    grib_context* c = a->context;
+
+    if ((ret = grib_get_long_internal(hand, self->Ni, &Ni)) != GRIB_SUCCESS)
+        return ret;
+
+    /* If Ni is not missing, then this is a plain gaussian grid and not reduced. */
+    /* So it cannot be an octahedral grid */
+    if (Ni != GRIB_MISSING_LONG) {
+        *val = 0;
+        return GRIB_SUCCESS;
+    }
+
+    if ((ret = grib_get_long_internal(hand, self->plpresent, &plpresent)) != GRIB_SUCCESS)
+        return ret;
+    if (!plpresent) {
+        *val = 0; /* Not octahedral */
+        return GRIB_SUCCESS;
+    }
+
+    if ((ret = grib_get_size(hand, self->pl, &plsize)) != GRIB_SUCCESS)
+        return ret;
+    Assert(plsize); /* pl array must have at least one element */
+
+    pl = (long*)grib_context_malloc_clear(c, sizeof(long) * plsize);
+    if (!pl) {
+        return GRIB_OUT_OF_MEMORY;
+    }
+    if ((ret = grib_get_long_array_internal(hand, self->pl, pl, &plsize)) != GRIB_SUCCESS)
+        return ret;
+
+    /* pl[0] is guaranteed to exist. Have already asserted previously */
+    *val = is_pl_octahedral(pl, plsize);
+    grib_context_free(c, pl);
+
+    return ret;
+}
+
+int grib_accessor_class_octahedral_gaussian_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    return GRIB_NOT_IMPLEMENTED;
+}
diff --git a/src/accessor/grib_accessor_class_octahedral_gaussian.h b/src/accessor/grib_accessor_class_octahedral_gaussian.h
new file mode 100644
index 000000000..31784d000
--- /dev/null
+++ b/src/accessor/grib_accessor_class_octahedral_gaussian.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_octahedral_gaussian_h
+#define eccodes_accessor_octahedral_gaussian_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_octahedral_gaussian_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in octahedral_gaussian */
+    const char*                  N;
+    const char*                  Ni;
+    const char*                  plpresent;
+    const char*                  pl;
+};
+
+class grib_accessor_class_octahedral_gaussian_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_octahedral_gaussian_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_octahedral_gaussian_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_octahedral_gaussian_h */
diff --git a/src/accessor/grib_accessor_class_octet_number.cc b/src/accessor/grib_accessor_class_octet_number.cc
new file mode 100644
index 000000000..4a4c28ad7
--- /dev/null
+++ b/src/accessor/grib_accessor_class_octet_number.cc
@@ -0,0 +1,47 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_octet_number.h"
+
+grib_accessor_class_octet_number_t _grib_accessor_class_octet_number{"octet_number"};
+grib_accessor_class* grib_accessor_class_octet_number = &_grib_accessor_class_octet_number;
+
+
+void grib_accessor_class_octet_number_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_octet_number_t* self = (grib_accessor_octet_number_t*)a;
+
+    int n = 0;
+    self->left  = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->right = grib_arguments_get_long(grib_handle_of_accessor(a), c, n++);
+
+    a->length = 0;
+}
+
+int grib_accessor_class_octet_number_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_octet_number_t* self = (grib_accessor_octet_number_t*)a;
+    int ret = GRIB_SUCCESS;
+    long offset;
+
+    offset = a->offset + self->right;
+
+    if ((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->left, offset)) != GRIB_SUCCESS)
+        return ret;
+
+    *val = offset;
+    *len = 1;
+
+    return ret;
+}
+
+int grib_accessor_class_octet_number_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_octet_number.h b/src/accessor/grib_accessor_class_octet_number.h
new file mode 100644
index 000000000..4d6145742
--- /dev/null
+++ b/src/accessor/grib_accessor_class_octet_number.h
@@ -0,0 +1,35 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_octet_number_h
+#define eccodes_accessor_octet_number_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_octet_number_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in octet_number */
+    const char*                  left;
+    long                         right;
+};
+
+class grib_accessor_class_octet_number_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_octet_number_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_octet_number_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_octet_number_h */
diff --git a/src/accessor/grib_accessor_class_offset_file.cc b/src/accessor/grib_accessor_class_offset_file.cc
new file mode 100644
index 000000000..ab9c79a11
--- /dev/null
+++ b/src/accessor/grib_accessor_class_offset_file.cc
@@ -0,0 +1,55 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_offset_file.h"
+
+grib_accessor_class_offset_file_t _grib_accessor_class_offset_file{"offset_file"};
+grib_accessor_class* grib_accessor_class_offset_file = &_grib_accessor_class_offset_file;
+
+
+void grib_accessor_class_offset_file_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->length = 0;
+}
+
+int grib_accessor_class_offset_file_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    *val = (double)grib_handle_of_accessor(a)->offset;
+    *len = 1;
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_offset_file_t::unpack_string(grib_accessor* a, char* v, size_t* len){
+    double val = 0;
+    size_t l   = 1;
+    char repres[1024] = {0,};
+    int err = 0;
+    const char* cclass_name = a->cclass->name;
+
+    err = a->unpack_double(&val, &l);    if (err) return err;
+
+    snprintf(repres, sizeof(repres), "%.0f", val);
+
+    l = strlen(repres) + 1;
+    if (l > *len) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
+                         cclass_name, a->name, l, *len);
+        *len = l;
+        return GRIB_BUFFER_TOO_SMALL;
+    }
+    grib_context_log(a->context, GRIB_LOG_DEBUG, "%s: Casting double %s to string", __func__, a->name);
+
+    *len = l;
+
+    strcpy(v, repres);
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_offset_file.h b/src/accessor/grib_accessor_class_offset_file.h
new file mode 100644
index 000000000..34243b5a4
--- /dev/null
+++ b/src/accessor/grib_accessor_class_offset_file.h
@@ -0,0 +1,33 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_offset_file_h
+#define eccodes_accessor_offset_file_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_double.h"
+
+class grib_accessor_offset_file_t : public grib_accessor_double_t
+{
+public:
+    /* Members defined in offset_file */
+};
+
+class grib_accessor_class_offset_file_t : public grib_accessor_class_double_t
+{
+public:
+    grib_accessor_class_offset_file_t(const char* name) : grib_accessor_class_double_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_offset_file_t{}; }
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_offset_file_h */
diff --git a/src/accessor/grib_accessor_class_offset_values.cc b/src/accessor/grib_accessor_class_offset_values.cc
new file mode 100644
index 000000000..bbd0139c9
--- /dev/null
+++ b/src/accessor/grib_accessor_class_offset_values.cc
@@ -0,0 +1,83 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_offset_values.h"
+
+grib_accessor_class_offset_values_t _grib_accessor_class_offset_values{"offset_values"};
+grib_accessor_class* grib_accessor_class_offset_values = &_grib_accessor_class_offset_values;
+
+
+void grib_accessor_class_offset_values_t::init(grib_accessor* a, const long l, grib_arguments* args){
+    int n                             = 0;
+    grib_accessor_offset_values_t* self = (grib_accessor_offset_values_t*)a;
+    self->values                      = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
+    self->missingValue                = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
+    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
+    a->length = 0;
+}
+
+int grib_accessor_class_offset_values_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    int ret = 0;
+    *val    = 0;
+    *len    = 1;
+    return ret;
+}
+
+int grib_accessor_class_offset_values_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    double* values            = NULL;
+    size_t size               = 0;
+    double missingValue       = 0;
+    long missingValuesPresent = 0;
+    int ret = 0, i = 0;
+    grib_accessor_offset_values_t* self = (grib_accessor_offset_values_t*)a;
+    grib_context* c                   = a->context;
+    grib_handle* h                    = grib_handle_of_accessor(a);
+
+    if (*val == 0)
+        return GRIB_SUCCESS;
+
+    if ((ret = grib_get_double_internal(h, self->missingValue, &missingValue)) != GRIB_SUCCESS) {
+        return ret;
+    }
+    if ((ret = grib_get_long_internal(h, "missingValuesPresent", &missingValuesPresent)) != GRIB_SUCCESS) {
+        return ret;
+    }
+
+    if ((ret = grib_get_size(h, self->values, &size)) != GRIB_SUCCESS)
+        return ret;
+
+    values = (double*)grib_context_malloc(c, size * sizeof(double));
+    if (!values)
+        return GRIB_OUT_OF_MEMORY;
+
+    if ((ret = grib_get_double_array_internal(h, self->values, values, &size)) != GRIB_SUCCESS) {
+        grib_context_free(c, values);
+        return ret;
+    }
+
+    for (i = 0; i < size; i++) {
+        if (missingValuesPresent) {
+            if (values[i] != missingValue)
+                values[i] += *val;
+        }
+        else {
+            values[i] += *val;
+        }
+    }
+
+    if ((ret = grib_set_double_array_internal(h, self->values, values, size)) != GRIB_SUCCESS)
+        return ret;
+
+    grib_context_free(c, values);
+
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_offset_values.h b/src/accessor/grib_accessor_class_offset_values.h
new file mode 100644
index 000000000..51e0f0f16
--- /dev/null
+++ b/src/accessor/grib_accessor_class_offset_values.h
@@ -0,0 +1,35 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_offset_values_h
+#define eccodes_accessor_offset_values_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_double.h"
+
+class grib_accessor_offset_values_t : public grib_accessor_double_t
+{
+public:
+    /* Members defined in offset_values */
+    const char* values;
+    const char* missingValue;
+};
+
+class grib_accessor_class_offset_values_t : public grib_accessor_class_double_t
+{
+public:
+    grib_accessor_class_offset_values_t(const char* name) : grib_accessor_class_double_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_offset_values_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_offset_values_h */
diff --git a/src/accessor/todo/grib_accessor_class_optimal_step_units.cc b/src/accessor/grib_accessor_class_optimal_step_units.cc
similarity index 54%
rename from src/accessor/todo/grib_accessor_class_optimal_step_units.cc
rename to src/accessor/grib_accessor_class_optimal_step_units.cc
index 261ff4c80..7a4802045 100644
--- a/src/accessor/todo/grib_accessor_class_optimal_step_units.cc
+++ b/src/accessor/grib_accessor_class_optimal_step_units.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,116 +10,16 @@
  */
 
 #include "grib_api_internal.h"
+#include "grib_accessor_class_optimal_step_units.h"
 #include "step.h"
 #include "step_utilities.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = pack_long;unpack_long;dump
-   IMPLEMENTS = pack_string;unpack_string;dump
-   IMPLEMENTS = string_length;pack_expression;get_native_type;is_missing
-   IMPLEMENTS = init
-   MEMBERS    = const char* forecast_time_value
-   MEMBERS    = const char* forecast_time_unit
-   MEMBERS    = const char* time_range_value 
-   MEMBERS    = const char* time_range_unit
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int is_missing(grib_accessor*);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int pack_string(grib_accessor*, const char*, size_t* len);
-static int pack_expression(grib_accessor*, grib_expression*);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static size_t string_length(grib_accessor*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_optimal_step_units
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in optimal_step_units */
-    const char* forecast_time_value;
-    const char* forecast_time_unit;
-    const char* time_range_value;
-    const char* time_range_unit;
-} grib_accessor_optimal_step_units;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_optimal_step_units = {
-    &grib_accessor_class_gen,                      /* super */
-    "optimal_step_units",                      /* name */
-    sizeof(grib_accessor_optimal_step_units),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    &string_length,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    &is_missing,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    &pack_string,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    &pack_expression,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
 
+grib_accessor_class_optimal_step_units_t _grib_accessor_class_optimal_step_units{"optimal_step_units"};
 grib_accessor_class* grib_accessor_class_optimal_step_units = &_grib_accessor_class_optimal_step_units;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_optimal_step_units* self = (grib_accessor_optimal_step_units*)a;
+void grib_accessor_class_optimal_step_units_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_optimal_step_units_t* self = (grib_accessor_optimal_step_units_t*)a;
     grib_handle* hand = grib_handle_of_accessor(a);
     int n = 0;
 
@@ -129,18 +30,15 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
     a->length = 0;
 }
 
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
+void grib_accessor_class_optimal_step_units_t::dump(grib_accessor* a, grib_dumper* dumper){
     grib_dump_string(dumper, a, NULL);
 }
 
-static size_t string_length(grib_accessor* a)
-{
+size_t grib_accessor_class_optimal_step_units_t::string_length(grib_accessor* a){
     return 255;
 }
 
-static int pack_expression(grib_accessor* a, grib_expression* e)
-{
+int grib_accessor_class_optimal_step_units_t::pack_expression(grib_accessor* a, grib_expression* e){
     const char* cval  = NULL;
     int ret           = 0;
     long lval         = 0;
@@ -150,8 +48,7 @@ static int pack_expression(grib_accessor* a, grib_expression* e)
 
     if (strcmp(e->cclass->name, "long") == 0) {
         grib_expression_evaluate_long(hand, e, &lval); /* TODO: check return value */
-        ret = grib_pack_long(a, &lval, &len);
-    }
+        ret = a->pack_long(&lval, &len);    }
     else {
         char tmp[1024];
         len  = sizeof(tmp);
@@ -165,16 +62,14 @@ static int pack_expression(grib_accessor* a, grib_expression* e)
         len = strlen(cval) + 1;
         //if (hand->context->debug)
         //    printf("ECCODES DEBUG grib_accessor_class_codetable::pack_expression %s %s\n", a->name, cval);
-        ret = grib_pack_string(a, cval, &len);
-    }
+        ret = a->pack_string(cval, &len);    }
     return ret;
 }
 
 static long staticStepUnits = eccodes::Unit{eccodes::Unit::Value::MISSING}.value<long>();
 static long staticForceStepUnits = eccodes::Unit{eccodes::Unit::Value::MISSING}.value<long>();
 
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
+int grib_accessor_class_optimal_step_units_t::pack_long(grib_accessor* a, const long* val, size_t* len){
     grib_handle* h = grib_handle_of_accessor(a);
     auto supported_units = eccodes::Unit::list_supported_units();
     try {
@@ -205,15 +100,14 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
+int grib_accessor_class_optimal_step_units_t::unpack_long(grib_accessor* a, long* val, size_t* len){
     try {
         if (eccodes::Unit{staticStepUnits} != eccodes::Unit{eccodes::Unit::Value::MISSING}) {
             *val = staticStepUnits;
             return GRIB_SUCCESS;
         }
 
-        const grib_accessor_optimal_step_units* self = (grib_accessor_optimal_step_units*)a;
+        const grib_accessor_optimal_step_units_t* self = (grib_accessor_optimal_step_units_t*)a;
         grib_handle* h = grib_handle_of_accessor(a);
 
         auto forecast_time_opt = get_step(h, self->forecast_time_value, self->forecast_time_unit);
@@ -242,8 +136,7 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int pack_string(grib_accessor* a, const char* val, size_t* len)
-{
+int grib_accessor_class_optimal_step_units_t::pack_string(grib_accessor* a, const char* val, size_t* len){
     try {
         long unit = eccodes::Unit{val}.value<long>();
         pack_long(a, &unit, len);
@@ -263,8 +156,7 @@ static int pack_string(grib_accessor* a, const char* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
+int grib_accessor_class_optimal_step_units_t::unpack_string(grib_accessor* a, char* val, size_t* len){
     int ret = 0;
     long unit = 0;
     size_t unit_len = 0;
@@ -276,12 +168,10 @@ static int unpack_string(grib_accessor* a, char* val, size_t* len)
 
 // Step units are never missing
 // If the user does not specify a step unit, we default to hours
-static int is_missing(grib_accessor* a)
-{
+int grib_accessor_class_optimal_step_units_t::is_missing(grib_accessor* a){
     return 0;
 }
 
-static int get_native_type(grib_accessor* a)
-{
+int grib_accessor_class_optimal_step_units_t::get_native_type(grib_accessor* a){
     return GRIB_TYPE_LONG;
 }
diff --git a/src/accessor/grib_accessor_class_optimal_step_units.h b/src/accessor/grib_accessor_class_optimal_step_units.h
new file mode 100644
index 000000000..96383b291
--- /dev/null
+++ b/src/accessor/grib_accessor_class_optimal_step_units.h
@@ -0,0 +1,44 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_optimal_step_units_h
+#define eccodes_accessor_optimal_step_units_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_optimal_step_units_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in optimal_step_units */
+    const char* forecast_time_value;
+    const char* forecast_time_unit;
+    const char* time_range_value;
+    const char* time_range_unit;
+};
+
+class grib_accessor_class_optimal_step_units_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_optimal_step_units_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_optimal_step_units_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int is_missing(grib_accessor*) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int pack_string(grib_accessor*, const char*, size_t* len) override;
+    int pack_expression(grib_accessor*, grib_expression*) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    size_t string_length(grib_accessor*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_optimal_step_units_h */
diff --git a/src/accessor/grib_accessor_class_pack_bufr_values.cc b/src/accessor/grib_accessor_class_pack_bufr_values.cc
new file mode 100644
index 000000000..803491932
--- /dev/null
+++ b/src/accessor/grib_accessor_class_pack_bufr_values.cc
@@ -0,0 +1,69 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_pack_bufr_values.h"
+
+grib_accessor_class_pack_bufr_values_t _grib_accessor_class_pack_bufr_values{"pack_bufr_values"};
+grib_accessor_class* grib_accessor_class_pack_bufr_values = &_grib_accessor_class_pack_bufr_values;
+
+
+void grib_accessor_class_pack_bufr_values_t::init(grib_accessor* a, const long len, grib_arguments* params){
+    char* key;
+    grib_accessor_pack_bufr_values_t* self = (grib_accessor_pack_bufr_values_t*)a;
+    key                                  = (char*)grib_arguments_get_name(grib_handle_of_accessor(a), params, 0);
+    self->data_accessor                  = grib_find_accessor(grib_handle_of_accessor(a), key);
+
+    a->length = 0;
+}
+
+void grib_accessor_class_pack_bufr_values_t::dump(grib_accessor* a, grib_dumper* dumper){
+}
+
+int grib_accessor_class_pack_bufr_values_t::unpack_string_array(grib_accessor* a, char** buffer, size_t* len){
+    return GRIB_NOT_IMPLEMENTED;
+}
+
+int grib_accessor_class_pack_bufr_values_t::unpack_string(grib_accessor* a, char* buffer, size_t* len){
+    return GRIB_NOT_IMPLEMENTED;
+}
+
+int grib_accessor_class_pack_bufr_values_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    return GRIB_NOT_IMPLEMENTED;
+}
+
+int grib_accessor_class_pack_bufr_values_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    return GRIB_NOT_IMPLEMENTED;
+}
+
+int grib_accessor_class_pack_bufr_values_t::value_count(grib_accessor* a, long* count){
+    *count = 1;
+    return 0;
+}
+
+void grib_accessor_class_pack_bufr_values_t::destroy(grib_context* context, grib_accessor* a){
+}
+
+int grib_accessor_class_pack_bufr_values_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_LONG;
+}
+
+int grib_accessor_class_pack_bufr_values_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_pack_bufr_values_t* self = (grib_accessor_pack_bufr_values_t*)a;
+    grib_accessor* data                  = (grib_accessor*)self->data_accessor;
+
+    return data->pack_double(0, 0);}
+
+int grib_accessor_class_pack_bufr_values_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_pack_bufr_values_t* self = (grib_accessor_pack_bufr_values_t*)a;
+    grib_accessor* data                  = (grib_accessor*)self->data_accessor;
+
+    return data->pack_double(0, 0);}
diff --git a/src/accessor/grib_accessor_class_pack_bufr_values.h b/src/accessor/grib_accessor_class_pack_bufr_values.h
new file mode 100644
index 000000000..b4bdaf43c
--- /dev/null
+++ b/src/accessor/grib_accessor_class_pack_bufr_values.h
@@ -0,0 +1,42 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_pack_bufr_values_h
+#define eccodes_accessor_pack_bufr_values_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_pack_bufr_values_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in pack_bufr_values */
+    grib_accessor* data_accessor;
+};
+
+class grib_accessor_class_pack_bufr_values_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_pack_bufr_values_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_pack_bufr_values_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    int unpack_string_array(grib_accessor*, char**, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void destroy(grib_context*, grib_accessor*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_pack_bufr_values_h */
diff --git a/src/accessor/grib_accessor_class_packing_type.cc b/src/accessor/grib_accessor_class_packing_type.cc
new file mode 100644
index 000000000..845400a00
--- /dev/null
+++ b/src/accessor/grib_accessor_class_packing_type.cc
@@ -0,0 +1,74 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_packing_type.h"
+
+grib_accessor_class_packing_type_t _grib_accessor_class_packing_type{"packing_type"};
+grib_accessor_class* grib_accessor_class_packing_type = &_grib_accessor_class_packing_type;
+
+
+void grib_accessor_class_packing_type_t::init(grib_accessor* a, const long l, grib_arguments* args){
+    int n                              = 0;
+    grib_accessor_packing_type_t* self = (grib_accessor_packing_type_t*)a;
+    self->values                       = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
+    self->packing_type                 = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
+    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
+    a->length = 0;
+}
+
+size_t grib_accessor_class_packing_type_t::string_length(grib_accessor* a){
+    return 1024;
+}
+
+int grib_accessor_class_packing_type_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_STRING;
+}
+
+int grib_accessor_class_packing_type_t::pack_string(grib_accessor*a, const char* sval, size_t* len){
+    grib_accessor_packing_type_t* self = (grib_accessor_packing_type_t*)a;
+    grib_handle* h = grib_handle_of_accessor(a);
+    double* values = NULL;
+    grib_context* c = a->context;
+    size_t size = 0;
+    int err = 0;
+
+    if ((err = grib_get_size(h, self->values, &size)) != GRIB_SUCCESS)
+        return err;
+
+    values = (double*)grib_context_malloc(c, size * sizeof(double));
+    if (!values) return GRIB_OUT_OF_MEMORY;
+
+    if ((err = grib_get_double_array_internal(h, self->values, values, &size)) != GRIB_SUCCESS) {
+        grib_context_free(c, values);
+        return err;
+    }
+
+    if ((err = grib_set_string_internal(h, self->packing_type, sval, len)) != GRIB_SUCCESS) {
+        grib_context_free(c, values);
+        return err;
+    }
+
+    if ((err = grib_set_double_array_internal(h, self->values, values, size)) != GRIB_SUCCESS) {
+        grib_context_free(c, values);
+        return err;
+    }
+
+    grib_context_free(c, values);
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_packing_type_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    grib_accessor_packing_type_t* self = (grib_accessor_packing_type_t*)a;
+    grib_handle* h                   = grib_handle_of_accessor(a);
+
+    return grib_get_string(h, self->packing_type, val, len);
+}
diff --git a/src/accessor/grib_accessor_class_packing_type.h b/src/accessor/grib_accessor_class_packing_type.h
new file mode 100644
index 000000000..3451db189
--- /dev/null
+++ b/src/accessor/grib_accessor_class_packing_type.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_packing_type_h
+#define eccodes_accessor_packing_type_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_packing_type_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in packing_type */
+    const char* values;
+    const char* packing_type;
+};
+
+class grib_accessor_class_packing_type_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_packing_type_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_packing_type_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_string(grib_accessor*, const char*, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    size_t string_length(grib_accessor*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_packing_type_h */
diff --git a/src/accessor/grib_accessor_class_pad.cc b/src/accessor/grib_accessor_class_pad.cc
new file mode 100644
index 000000000..10ceda53c
--- /dev/null
+++ b/src/accessor/grib_accessor_class_pad.cc
@@ -0,0 +1,36 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_pad.h"
+
+grib_accessor_class_pad_t _grib_accessor_class_pad{"pad"};
+grib_accessor_class* grib_accessor_class_pad = &_grib_accessor_class_pad;
+
+
+
+size_t grib_accessor_class_pad_t::preferred_size(grib_accessor* a, int from_handle){
+    grib_accessor_pad_t* self = (grib_accessor_pad_t*)a;
+
+    long length = 0;
+
+    grib_expression_evaluate_long(grib_handle_of_accessor(a), self->expression, &length);
+
+    return length > 0 ? length : 0;
+}
+
+
+void grib_accessor_class_pad_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    grib_accessor_pad_t* self = (grib_accessor_pad_t*)a;
+
+    self->expression = grib_arguments_get_expression(grib_handle_of_accessor(a), arg, 0);
+    a->length        = preferred_size(a, 1);
+}
diff --git a/src/accessor/grib_accessor_class_pad.h b/src/accessor/grib_accessor_class_pad.h
new file mode 100644
index 000000000..8ca8bb09b
--- /dev/null
+++ b/src/accessor/grib_accessor_class_pad.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_pad_h
+#define eccodes_accessor_pad_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_padding.h"
+
+class grib_accessor_pad_t : public grib_accessor_padding_t
+{
+public:
+    /* Members defined in padding */
+    /* Members defined in pad */
+    grib_expression* expression;
+};
+
+class grib_accessor_class_pad_t : public grib_accessor_class_padding_t
+{
+public:
+    grib_accessor_class_pad_t(const char* name) : grib_accessor_class_padding_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_pad_t{}; }
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    size_t preferred_size(grib_accessor*, int) override;
+};
+#endif /* eccodes_accessor_pad_h */
diff --git a/src/accessor/grib_accessor_class_padding.cc b/src/accessor/grib_accessor_class_padding.cc
new file mode 100644
index 000000000..5a1699124
--- /dev/null
+++ b/src/accessor/grib_accessor_class_padding.cc
@@ -0,0 +1,58 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_padding.h"
+
+grib_accessor_class_padding_t _grib_accessor_class_padding{"padding"};
+grib_accessor_class* grib_accessor_class_padding = &_grib_accessor_class_padding;
+
+
+void grib_accessor_class_padding_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    a->flags |= GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC;
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+}
+
+int grib_accessor_class_padding_t::compare(grib_accessor* a, grib_accessor* b){
+    if (a->length != b->length)
+        return GRIB_COUNT_MISMATCH;
+    return GRIB_SUCCESS;
+}
+
+void grib_accessor_class_padding_t::update_size(grib_accessor* a, size_t new_size){
+    a->length = new_size;
+}
+
+void grib_accessor_class_padding_t::resize(grib_accessor* a, size_t new_size){
+    void* zero = grib_context_malloc_clear(a->context, new_size);
+
+    grib_buffer_replace(a, (const unsigned char*)zero, new_size,
+                        /*update_lengths=*/1, /*update_paddings=*/0);
+    grib_context_free(a->context, zero);
+
+    grib_context_log(a->context, GRIB_LOG_DEBUG, 
+                "grib_accessor_class_padding::resize new_size=%zu a->length=%ld %s %s",
+                new_size, a->length, a->cclass->name, a->name);
+    Assert(new_size == a->length);
+}
+
+int grib_accessor_class_padding_t::value_count(grib_accessor* a, long* c){
+    *c = a->length;
+    return 0;
+}
+
+long grib_accessor_class_padding_t::byte_count(grib_accessor* a){
+    return a->length;
+}
+
+size_t grib_accessor_class_padding_t::string_length(grib_accessor* a){
+    return (size_t)a->length;
+}
diff --git a/src/accessor/grib_accessor_class_padding.h b/src/accessor/grib_accessor_class_padding.h
new file mode 100644
index 000000000..65a416c4c
--- /dev/null
+++ b/src/accessor/grib_accessor_class_padding.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_padding_h
+#define eccodes_accessor_padding_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_bytes.h"
+
+class grib_accessor_padding_t : public grib_accessor_bytes_t
+{
+public:
+    /* Members defined in padding */
+};
+
+class grib_accessor_class_padding_t : public grib_accessor_class_bytes_t
+{
+public:
+    grib_accessor_class_padding_t(const char* name) : grib_accessor_class_bytes_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_padding_t{}; }
+    size_t string_length(grib_accessor*) override;
+    long byte_count(grib_accessor*) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    void update_size(grib_accessor*, size_t) override;
+    void resize(grib_accessor*,size_t) override;
+    int compare(grib_accessor*, grib_accessor*) override;
+};
+#endif /* eccodes_accessor_padding_h */
diff --git a/src/accessor/grib_accessor_class_padto.cc b/src/accessor/grib_accessor_class_padto.cc
new file mode 100644
index 000000000..79207c8a9
--- /dev/null
+++ b/src/accessor/grib_accessor_class_padto.cc
@@ -0,0 +1,45 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_padto.h"
+
+grib_accessor_class_padto_t _grib_accessor_class_padto{"padto"};
+grib_accessor_class* grib_accessor_class_padto = &_grib_accessor_class_padto;
+
+
+
+size_t grib_accessor_class_padto_t::preferred_size(grib_accessor* a, int from_handle){
+    grib_accessor_padto_t* self = (grib_accessor_padto_t*)a;
+
+    long length = 0;
+    long theEnd;
+
+    grib_expression_evaluate_long(grib_handle_of_accessor(a), self->expression, &theEnd);
+
+    length = theEnd - a->offset;
+
+    /* printf("preferred_size: prefered: %ld current:%ld %s %s %ld\n", (long)length,(long)a->length,a->cclass->name,a->name,(long)a->offset); */
+
+    return length > 0 ? length : 0;
+}
+
+
+void grib_accessor_class_padto_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    grib_accessor_padto_t* self = (grib_accessor_padto_t*)a;
+
+    self->expression = grib_arguments_get_expression(grib_handle_of_accessor(a), arg, 0);
+    a->length        = preferred_size(a, 1);
+}
+
+void grib_accessor_class_padto_t::dump(grib_accessor* a, grib_dumper* dumper){
+    /*grib_dump_string(dumper,a,NULL);*/
+}
diff --git a/src/accessor/grib_accessor_class_padto.h b/src/accessor/grib_accessor_class_padto.h
new file mode 100644
index 000000000..f7203b2cb
--- /dev/null
+++ b/src/accessor/grib_accessor_class_padto.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_padto_h
+#define eccodes_accessor_padto_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_padding.h"
+
+class grib_accessor_padto_t : public grib_accessor_padding_t
+{
+public:
+    /* Members defined in padto */
+    grib_expression* expression;
+};
+
+class grib_accessor_class_padto_t : public grib_accessor_class_padding_t
+{
+public:
+    grib_accessor_class_padto_t(const char* name) : grib_accessor_class_padding_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_padto_t{}; }
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    size_t preferred_size(grib_accessor*, int) override;
+};
+#endif /* eccodes_accessor_padto_h */
diff --git a/src/accessor/grib_accessor_class_padtoeven.cc b/src/accessor/grib_accessor_class_padtoeven.cc
new file mode 100644
index 000000000..5d3dfba45
--- /dev/null
+++ b/src/accessor/grib_accessor_class_padtoeven.cc
@@ -0,0 +1,48 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_padtoeven.h"
+
+grib_accessor_class_padtoeven_t _grib_accessor_class_padtoeven{"padtoeven"};
+grib_accessor_class* grib_accessor_class_padtoeven = &_grib_accessor_class_padtoeven;
+
+
+size_t grib_accessor_class_padtoeven_t::preferred_size(grib_accessor* a, int from_handle){
+    grib_accessor_padtoeven_t* self = (grib_accessor_padtoeven_t*)a;
+    long offset                   = 0;
+    long length                   = 0;
+    long seclen;
+
+    grib_get_long_internal(grib_handle_of_accessor(a), self->section_offset, &offset);
+    grib_get_long_internal(grib_handle_of_accessor(a), self->section_length, &length);
+
+    if ((length % 2) && from_handle) {
+        //  grib_context_log(a->context,
+        //       GRIB_LOG_ERROR,"GRIB message has an odd length section (%ld, %s)",
+        //       (long)length,a->name);
+        return 0;
+    }
+
+    /* printf("EVEN %ld %ld\n",(long) a->offset,(long) offset);*/
+    seclen = a->offset - offset;
+
+    return (seclen % 2) ? 1 : 0;
+}
+
+void grib_accessor_class_padtoeven_t::init(grib_accessor* a, const long len, grib_arguments* args){
+    grib_accessor_padtoeven_t* self = (grib_accessor_padtoeven_t*)a;
+
+    self->section_offset = grib_arguments_get_name(grib_handle_of_accessor(a), args, 0);
+    self->section_length = grib_arguments_get_name(grib_handle_of_accessor(a), args, 1);
+
+    a->length = preferred_size(a, 1);
+}
diff --git a/src/accessor/grib_accessor_class_padtoeven.h b/src/accessor/grib_accessor_class_padtoeven.h
new file mode 100644
index 000000000..08f8fc072
--- /dev/null
+++ b/src/accessor/grib_accessor_class_padtoeven.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_padtoeven_h
+#define eccodes_accessor_padtoeven_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_padding.h"
+
+class grib_accessor_padtoeven_t : public grib_accessor_padding_t
+{
+public:
+    /* Members defined in padtoeven */
+    const char*  section_offset;
+    const char*  section_length;
+};
+
+class grib_accessor_class_padtoeven_t : public grib_accessor_class_padding_t
+{
+public:
+    grib_accessor_class_padtoeven_t(const char* name) : grib_accessor_class_padding_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_padtoeven_t{}; }
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    size_t preferred_size(grib_accessor*, int) override;
+};
+#endif /* eccodes_accessor_padtoeven_h */
diff --git a/src/accessor/grib_accessor_class_padtomultiple.cc b/src/accessor/grib_accessor_class_padtomultiple.cc
new file mode 100644
index 000000000..3f92f8409
--- /dev/null
+++ b/src/accessor/grib_accessor_class_padtomultiple.cc
@@ -0,0 +1,40 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_padtomultiple.h"
+
+grib_accessor_class_padtomultiple_t _grib_accessor_class_padtomultiple{"padtomultiple"};
+grib_accessor_class* grib_accessor_class_padtomultiple = &_grib_accessor_class_padtomultiple;
+
+
+size_t grib_accessor_class_padtomultiple_t::preferred_size(grib_accessor* a, int from_handle){
+    grib_accessor_padtomultiple_t* self = (grib_accessor_padtomultiple_t*)a;
+    long padding                      = 0;
+    long begin                        = 0;
+    long multiple                     = 0;
+
+    grib_expression_evaluate_long(grib_handle_of_accessor(a), self->begin, &begin);
+    grib_expression_evaluate_long(grib_handle_of_accessor(a), self->multiple, &multiple);
+
+    padding = a->offset - begin;
+    padding = ((padding + multiple - 1) / multiple) * multiple - padding;
+
+    return padding == 0 ? multiple : padding;
+}
+
+void grib_accessor_class_padtomultiple_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    grib_accessor_padtomultiple_t* self = (grib_accessor_padtomultiple_t*)a;
+
+    self->begin    = grib_arguments_get_expression(grib_handle_of_accessor(a), arg, 0);
+    self->multiple = grib_arguments_get_expression(grib_handle_of_accessor(a), arg, 1);
+    a->length      = preferred_size(a, 1);
+}
diff --git a/src/accessor/grib_accessor_class_padtomultiple.h b/src/accessor/grib_accessor_class_padtomultiple.h
new file mode 100644
index 000000000..f57afad37
--- /dev/null
+++ b/src/accessor/grib_accessor_class_padtomultiple.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_padtomultiple_h
+#define eccodes_accessor_padtomultiple_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_padding.h"
+
+class grib_accessor_padtomultiple_t : public grib_accessor_padding_t
+{
+public:
+    /* Members defined in padtomultiple */
+    grib_expression* begin;
+    grib_expression* multiple;
+};
+
+class grib_accessor_class_padtomultiple_t : public grib_accessor_class_padding_t
+{
+public:
+    grib_accessor_class_padtomultiple_t(const char* name) : grib_accessor_class_padding_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_padtomultiple_t{}; }
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    size_t preferred_size(grib_accessor*, int) override;
+};
+#endif /* eccodes_accessor_padtomultiple_h */
diff --git a/src/accessor/grib_accessor_class_position.cc b/src/accessor/grib_accessor_class_position.cc
new file mode 100644
index 000000000..fb00740f3
--- /dev/null
+++ b/src/accessor/grib_accessor_class_position.cc
@@ -0,0 +1,50 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_position.h"
+
+grib_accessor_class_position_t _grib_accessor_class_position{"position"};
+grib_accessor_class* grib_accessor_class_position = &_grib_accessor_class_position;
+
+
+void grib_accessor_class_position_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    a->length = 0;
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->flags |= GRIB_ACCESSOR_FLAG_HIDDEN;
+    a->flags |= GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC;
+}
+
+int grib_accessor_class_position_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_LONG;
+}
+
+void grib_accessor_class_position_t::dump(grib_accessor* a, grib_dumper* dumper){
+    grib_dump_long(dumper, a, NULL);
+}
+
+int grib_accessor_class_position_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    if (*len < 1) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s it contains %d values ", a->name, 1);
+        *len = 0;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+    *val = a->offset;
+    *len = 1;
+    return GRIB_SUCCESS;
+}
+
+// static int compare(grib_accessor* a, grib_accessor* b)
+// {
+//     if (a->offset != b->offset)
+//         return GRIB_OFFSET_MISMATCH;
+//     return GRIB_SUCCESS;
+// }
diff --git a/src/accessor/grib_accessor_class_position.h b/src/accessor/grib_accessor_class_position.h
new file mode 100644
index 000000000..40d690694
--- /dev/null
+++ b/src/accessor/grib_accessor_class_position.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_position_h
+#define eccodes_accessor_position_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_position_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in position */
+};
+
+class grib_accessor_class_position_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_position_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_position_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_position_h */
diff --git a/src/accessor/todo/grib_accessor_class_proj_string.cc b/src/accessor/grib_accessor_class_proj_string.cc
similarity index 67%
rename from src/accessor/todo/grib_accessor_class_proj_string.cc
rename to src/accessor/grib_accessor_class_proj_string.cc
index 7edfbf5be..ab03465fb 100644
--- a/src/accessor/todo/grib_accessor_class_proj_string.cc
+++ b/src/accessor/grib_accessor_class_proj_string.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,101 +10,14 @@
  */
 
 #include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = get_native_type;init
-   IMPLEMENTS = unpack_string
-   MEMBERS = const char* grid_type
-   MEMBERS = int endpoint
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_proj_string
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in proj_string */
-    const char* grid_type;
-    int endpoint;
-} grib_accessor_proj_string;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_proj_string = {
-    &grib_accessor_class_gen,                      /* super */
-    "proj_string",                      /* name */
-    sizeof(grib_accessor_proj_string),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_proj_string.h"
 
+grib_accessor_class_proj_string_t _grib_accessor_class_proj_string{"proj_string"};
 grib_accessor_class* grib_accessor_class_proj_string = &_grib_accessor_class_proj_string;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    grib_accessor_proj_string* self = (grib_accessor_proj_string*)a;
+void grib_accessor_class_proj_string_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    grib_accessor_proj_string_t* self = (grib_accessor_proj_string_t*)a;
     grib_handle* h                  = grib_handle_of_accessor(a);
 
     self->grid_type = grib_arguments_get_name(h, arg, 0);
@@ -113,8 +27,7 @@ static void init(grib_accessor* a, const long len, grib_arguments* arg)
     a->flags |= GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC;
 }
 
-static int get_native_type(grib_accessor* a)
-{
+int grib_accessor_class_proj_string_t::get_native_type(grib_accessor* a){
     return GRIB_TYPE_STRING;
 }
 
@@ -128,8 +41,7 @@ struct proj_mapping
 typedef struct proj_mapping proj_mapping;
 
 // This should only be called for GRID POINT data (not spherical harmonics etc)
-static int get_major_minor_axes(grib_handle* h, double* pMajor, double* pMinor)
-{
+int get_major_minor_axes(grib_handle* h, double* pMajor, double* pMinor){
     int err = 0;
     if (grib_is_earth_oblate(h)) {
         if ((err = grib_get_double_internal(h, "earthMinorAxisInMetres", pMinor)) != GRIB_SUCCESS) return err;
@@ -144,8 +56,7 @@ static int get_major_minor_axes(grib_handle* h, double* pMajor, double* pMinor)
 }
 
 // Caller must have allocated enough space in the 'result' argument
-static int get_earth_shape(grib_handle* h, char* result)
-{
+int get_earth_shape(grib_handle* h, char* result){
     int err      = 0;
     double major = 0, minor = 0;
     if ((err = get_major_minor_axes(h, &major, &minor)) != GRIB_SUCCESS)
@@ -157,8 +68,7 @@ static int get_earth_shape(grib_handle* h, char* result)
     return err;
 }
 
-static int proj_space_view(grib_handle* h, char* result)
-{
+int proj_space_view(grib_handle* h, char* result){
     return GRIB_NOT_IMPLEMENTED;
     //     int err        = 0;
     //     char shape[128] = {0,};
@@ -174,21 +84,17 @@ static int proj_space_view(grib_handle* h, char* result)
     //     return err;
 }
 
-static int proj_albers(grib_handle* h, char* result)
-{
+int proj_albers(grib_handle* h, char* result){
     return GRIB_NOT_IMPLEMENTED;
 }
-static int proj_transverse_mercator(grib_handle* h, char* result)
-{
+int proj_transverse_mercator(grib_handle* h, char* result){
     return GRIB_NOT_IMPLEMENTED;
 }
-static int proj_equatorial_azimuthal_equidistant(grib_handle* h, char* result)
-{
+int proj_equatorial_azimuthal_equidistant(grib_handle* h, char* result){
     return GRIB_NOT_IMPLEMENTED;
 }
 
-static int proj_lambert_conformal(grib_handle* h, char* result)
-{
+int proj_lambert_conformal(grib_handle* h, char* result){
     int err        = 0;
     char shape[128] = {0,};
     double LoVInDegrees = 0, LaDInDegrees = 0, Latin1InDegrees = 0, Latin2InDegrees = 0;
@@ -208,8 +114,7 @@ static int proj_lambert_conformal(grib_handle* h, char* result)
     return err;
 }
 
-static int proj_lambert_azimuthal_equal_area(grib_handle* h, char* result)
-{
+int proj_lambert_azimuthal_equal_area(grib_handle* h, char* result){
     int err        = 0;
     char shape[128] = {0,};
     double standardParallel = 0, centralLongitude = 0;
@@ -225,8 +130,7 @@ static int proj_lambert_azimuthal_equal_area(grib_handle* h, char* result)
     return err;
 }
 
-static int proj_polar_stereographic(grib_handle* h, char* result)
-{
+int proj_polar_stereographic(grib_handle* h, char* result){
     int err                 = 0;
     double centralLongitude = 0, centralLatitude = 0;
     int has_northPole         = 0;
@@ -249,8 +153,7 @@ static int proj_polar_stereographic(grib_handle* h, char* result)
 
 // ECC-1552: This is for regular_ll, regular_gg, reduced_ll, reduced_gg
 //           These are not 'projected' grids!
-static int proj_unprojected(grib_handle* h, char* result)
-{
+int proj_unprojected(grib_handle* h, char* result){
     int err = 0;
     //char shape[128] = {0,};
     //if ((err = get_earth_shape(h, shape)) != GRIB_SUCCESS) return err;
@@ -260,8 +163,7 @@ static int proj_unprojected(grib_handle* h, char* result)
     return err;
 }
 
-static int proj_mercator(grib_handle* h, char* result)
-{
+int proj_mercator(grib_handle* h, char* result){
     int err             = 0;
     double LaDInDegrees = 0;
     char shape[128]      = {0,};
@@ -293,9 +195,8 @@ static proj_mapping proj_mappings[] = {
 
 #define ENDPOINT_SOURCE 0
 #define ENDPOINT_TARGET 1
-static int unpack_string(grib_accessor* a, char* v, size_t* len)
-{
-    grib_accessor_proj_string* self = (grib_accessor_proj_string*)a;
+int grib_accessor_class_proj_string_t::unpack_string(grib_accessor* a, char* v, size_t* len){
+    grib_accessor_proj_string_t* self = (grib_accessor_proj_string_t*)a;
     int err = 0, found = 0;
     size_t i = 0;
     char grid_type[64] = {0,};
diff --git a/src/accessor/grib_accessor_class_proj_string.h b/src/accessor/grib_accessor_class_proj_string.h
new file mode 100644
index 000000000..c49c0f868
--- /dev/null
+++ b/src/accessor/grib_accessor_class_proj_string.h
@@ -0,0 +1,35 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_proj_string_h
+#define eccodes_accessor_proj_string_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_proj_string_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in proj_string */
+    const char* grid_type;
+    int endpoint;
+};
+
+class grib_accessor_class_proj_string_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_proj_string_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_proj_string_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_proj_string_h */
diff --git a/src/accessor/grib_accessor_class_raw.cc b/src/accessor/grib_accessor_class_raw.cc
new file mode 100644
index 000000000..310d887e3
--- /dev/null
+++ b/src/accessor/grib_accessor_class_raw.cc
@@ -0,0 +1,117 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_raw.h"
+
+grib_accessor_class_raw_t _grib_accessor_class_raw{"raw"};
+grib_accessor_class* grib_accessor_class_raw = &_grib_accessor_class_raw;
+
+
+void grib_accessor_class_raw_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    int n   = 0;
+    int err = 0;
+    long sectionLength;
+    grib_accessor_raw_t* self = (grib_accessor_raw_t*)a;
+    grib_expression* e;
+    grib_handle* hand = grib_handle_of_accessor(a);
+
+    a->length           = 0;
+    self->totalLength   = grib_arguments_get_name(hand, arg, n++);
+    self->sectionLength = grib_arguments_get_name(hand, arg, n++);
+
+    e   = grib_arguments_get_expression(hand, arg, n++);
+    err = grib_expression_evaluate_long(hand, e, &(self->relativeOffset));
+    if (err)
+        grib_context_log(hand->context, GRIB_LOG_ERROR, "Unable to evaluate relativeOffset");
+
+    grib_get_long(hand, self->sectionLength, &sectionLength);
+
+    a->length = sectionLength - self->relativeOffset;
+    if (a->length < 0)
+        a->length = 0;
+
+    /* Assert(a->length>=0); */
+}
+
+int grib_accessor_class_raw_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_BYTES;
+}
+
+
+int grib_accessor_class_raw_t::compare(grib_accessor* a, grib_accessor* b){
+    int retval = GRIB_SUCCESS;
+
+    size_t alen = (size_t)a->byte_count();    size_t blen = (size_t)b->byte_count();
+    if (alen != blen)
+        return GRIB_COUNT_MISMATCH;
+
+    return retval;
+}
+
+long grib_accessor_class_raw_t::byte_count(grib_accessor* a){
+    return a->length;
+}
+
+int grib_accessor_class_raw_t::value_count(grib_accessor* a, long* len){
+    *len = a->length;
+    return 0;
+}
+
+int grib_accessor_class_raw_t::unpack_bytes(grib_accessor* a, unsigned char* buffer, size_t* len){
+    if (*len < a->length) {
+        *len = a->length;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+    *len = a->length;
+
+    memcpy(buffer, grib_handle_of_accessor(a)->buffer->data + a->offset, *len);
+
+    return GRIB_SUCCESS;
+}
+
+void grib_accessor_class_raw_t::update_size(grib_accessor* a, size_t s){
+    grib_context_log(a->context, GRIB_LOG_DEBUG, "updating size of %s old %ld new %ld", a->name, a->length, s);
+    a->length = s;
+    Assert(a->length >= 0);
+}
+
+void accessor_raw_set_length(grib_accessor* a, size_t len)
+{
+    a->length = len;
+}
+
+long accessor_raw_get_offset(grib_accessor* a)
+{
+    return a->offset;
+}
+
+int grib_accessor_class_raw_t::pack_bytes(grib_accessor* a, const unsigned char* val, size_t* len){
+    size_t length = *len;
+    long totalLength;
+    long sectionLength;
+    grib_handle* h          = grib_handle_of_accessor(a);
+    grib_accessor_raw_t* self = (grib_accessor_raw_t*)a;
+    long dlen               = length - a->length;
+
+    grib_get_long(h, self->totalLength, &totalLength);
+    totalLength += dlen;
+    grib_get_long(h, self->sectionLength, &sectionLength);
+    sectionLength += dlen;
+
+    grib_buffer_replace(a, val, length, 1, 1);
+
+    grib_set_long(h, self->totalLength, totalLength);
+    grib_set_long(h, self->sectionLength, sectionLength);
+    a->length = length;
+
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_raw.h b/src/accessor/grib_accessor_class_raw.h
new file mode 100644
index 000000000..30a2603e7
--- /dev/null
+++ b/src/accessor/grib_accessor_class_raw.h
@@ -0,0 +1,41 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_raw_h
+#define eccodes_accessor_raw_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_raw_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in raw */
+    const char* totalLength;
+    const char* sectionLength;
+    long relativeOffset;
+};
+
+class grib_accessor_class_raw_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_raw_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_raw_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_bytes(grib_accessor*, const unsigned char*, size_t* len) override;
+    int unpack_bytes(grib_accessor*, unsigned char*, size_t* len) override;
+    long byte_count(grib_accessor*) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    void update_size(grib_accessor*, size_t) override;
+    int compare(grib_accessor*, grib_accessor*) override;
+};
+#endif /* eccodes_accessor_raw_h */
diff --git a/src/accessor/grib_accessor_class_rdbtime_guess_date.cc b/src/accessor/grib_accessor_class_rdbtime_guess_date.cc
new file mode 100644
index 000000000..346288ad2
--- /dev/null
+++ b/src/accessor/grib_accessor_class_rdbtime_guess_date.cc
@@ -0,0 +1,76 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_rdbtime_guess_date.h"
+
+grib_accessor_class_rdbtime_guess_date_t _grib_accessor_class_rdbtime_guess_date{"rdbtime_guess_date"};
+grib_accessor_class* grib_accessor_class_rdbtime_guess_date = &_grib_accessor_class_rdbtime_guess_date;
+
+
+void grib_accessor_class_rdbtime_guess_date_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_rdbtime_guess_date_t* self = (grib_accessor_rdbtime_guess_date_t*)a;
+    int n                                  = 0;
+
+    self->typicalYear  = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->typicalMonth = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->typicalDay   = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->rdbDay       = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->yearOrMonth  = grib_arguments_get_long(grib_handle_of_accessor(a), c, n++);
+
+    /* a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY; */
+}
+
+int grib_accessor_class_rdbtime_guess_date_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_rdbtime_guess_date_t* self = (grib_accessor_rdbtime_guess_date_t*)a;
+    grib_handle* h                         = grib_handle_of_accessor(a);
+    int ret                                = 0;
+    long typicalYear, typicalMonth, typicalDay, rdbDay;
+    long rdbYear, rdbMonth;
+
+    ret = grib_get_long(h, self->typicalYear, &typicalYear);
+    if (ret)
+        return ret;
+    ret = grib_get_long(h, self->typicalMonth, &typicalMonth);
+    if (ret)
+        return ret;
+    ret = grib_get_long(h, self->typicalDay, &typicalDay);
+    if (ret)
+        return ret;
+    ret = grib_get_long(h, self->rdbDay, &rdbDay);
+    if (ret)
+        return ret;
+
+    if (rdbDay < typicalDay) {
+        if (typicalDay == 31 && typicalMonth == 12) {
+            rdbYear  = typicalYear + 1;
+            rdbMonth = 1;
+        }
+        else {
+            rdbYear  = typicalYear;
+            rdbMonth = typicalMonth + 1;
+        }
+    }
+    else {
+        rdbYear  = typicalYear;
+        rdbMonth = typicalMonth;
+    }
+
+    *val = self->yearOrMonth == 1 ? rdbYear : rdbMonth;
+    *len = 1;
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_rdbtime_guess_date_t::pack_long(grib_accessor* a, const long* v, size_t* len){
+    /* do nothing*/
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_rdbtime_guess_date.h b/src/accessor/grib_accessor_class_rdbtime_guess_date.h
new file mode 100644
index 000000000..e9ef0b4d3
--- /dev/null
+++ b/src/accessor/grib_accessor_class_rdbtime_guess_date.h
@@ -0,0 +1,38 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_rdbtime_guess_date_h
+#define eccodes_accessor_rdbtime_guess_date_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_rdbtime_guess_date_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in rdbtime_guess_date */
+    const char* typicalYear;
+    const char* typicalMonth;
+    const char* typicalDay;
+    const char* rdbDay;
+    long yearOrMonth;
+};
+
+class grib_accessor_class_rdbtime_guess_date_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_rdbtime_guess_date_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_rdbtime_guess_date_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_rdbtime_guess_date_h */
diff --git a/src/accessor/grib_accessor_class_reference_value_error.cc b/src/accessor/grib_accessor_class_reference_value_error.cc
new file mode 100644
index 000000000..8d4f3a1cc
--- /dev/null
+++ b/src/accessor/grib_accessor_class_reference_value_error.cc
@@ -0,0 +1,50 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_reference_value_error.h"
+
+grib_accessor_class_reference_value_error_t _grib_accessor_class_reference_value_error{"reference_value_error"};
+grib_accessor_class* grib_accessor_class_reference_value_error = &_grib_accessor_class_reference_value_error;
+
+
+void grib_accessor_class_reference_value_error_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_reference_value_error_t* self = (grib_accessor_reference_value_error_t*)a;
+    int n                                     = 0;
+
+    self->referenceValue = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->floatType      = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->length = 0;
+}
+
+int grib_accessor_class_reference_value_error_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_reference_value_error_t* self = (grib_accessor_reference_value_error_t*)a;
+    int ret                                   = 0;
+    double referenceValue                     = 0;
+
+    if ((ret = grib_get_double_internal(grib_handle_of_accessor(a),
+                                        self->referenceValue, &referenceValue)) != GRIB_SUCCESS)
+        return ret;
+
+    if (!strcmp(self->floatType, "ibm"))
+        *val = grib_ibmfloat_error(referenceValue);
+    else if (!strcmp(self->floatType, "ieee"))
+        *val = grib_ieeefloat_error(referenceValue);
+    else
+        Assert(1 == 0);
+
+    if (ret == GRIB_SUCCESS)
+        *len = 1;
+
+    return ret;
+}
diff --git a/src/accessor/grib_accessor_class_reference_value_error.h b/src/accessor/grib_accessor_class_reference_value_error.h
new file mode 100644
index 000000000..e0b948e97
--- /dev/null
+++ b/src/accessor/grib_accessor_class_reference_value_error.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_reference_value_error_h
+#define eccodes_accessor_reference_value_error_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_double.h"
+
+class grib_accessor_reference_value_error_t : public grib_accessor_double_t
+{
+public:
+    /* Members defined in reference_value_error */
+    const char*    referenceValue;
+    const char*    floatType;
+};
+
+class grib_accessor_class_reference_value_error_t : public grib_accessor_class_double_t
+{
+public:
+    grib_accessor_class_reference_value_error_t(const char* name) : grib_accessor_class_double_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_reference_value_error_t{}; }
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_reference_value_error_h */
diff --git a/src/accessor/grib_accessor_class_round.cc b/src/accessor/grib_accessor_class_round.cc
new file mode 100644
index 000000000..b1a114d0e
--- /dev/null
+++ b/src/accessor/grib_accessor_class_round.cc
@@ -0,0 +1,69 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_round.h"
+
+grib_accessor_class_round_t _grib_accessor_class_round{"round"};
+grib_accessor_class* grib_accessor_class_round = &_grib_accessor_class_round;
+
+
+int grib_accessor_class_round_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_round_t* self = (grib_accessor_round_t*)a;
+
+    int ret = GRIB_SUCCESS;
+
+    size_t replen             = 0;
+    double rounding_precision = 0;
+    double rounded            = 0;
+    double toround            = 0;
+
+    const char* oval = NULL;
+    oval             = grib_arguments_get_name(grib_handle_of_accessor(a), self->arg, 0);
+
+    if ((ret = grib_get_double_internal(grib_handle_of_accessor(a), oval, &toround)) != 0)
+        return ret;
+
+    rounding_precision = grib_arguments_get_long(grib_handle_of_accessor(a), self->arg, 1);
+
+    rounded = floor(rounding_precision * toround + 0.5) / rounding_precision;
+
+    *len = replen;
+
+    *val = rounded;
+
+    return ret;
+}
+
+int grib_accessor_class_round_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    char result[1024];
+    int ret       = GRIB_SUCCESS;
+    size_t replen = 1;
+
+    double value = 0;
+
+    ret = unpack_double(a, &value, &replen);
+
+    snprintf(result, sizeof(result), "%.3f", value);
+
+    replen = strlen(result) + 1;
+
+    if (*len < replen) {
+        *len = replen;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    *len = replen;
+
+    snprintf(val, 1024, "%s", result);
+
+    return ret;
+}
diff --git a/src/accessor/grib_accessor_class_round.h b/src/accessor/grib_accessor_class_round.h
new file mode 100644
index 000000000..c38d7b6e8
--- /dev/null
+++ b/src/accessor/grib_accessor_class_round.h
@@ -0,0 +1,32 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_round_h
+#define eccodes_accessor_round_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_evaluate.h"
+
+class grib_accessor_round_t : public grib_accessor_evaluate_t
+{
+public:
+    /* Members defined in round */
+};
+
+class grib_accessor_class_round_t : public grib_accessor_class_evaluate_t
+{
+public:
+    grib_accessor_class_round_t(const char* name) : grib_accessor_class_evaluate_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_round_t{}; }
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+};
+#endif /* eccodes_accessor_round_h */
diff --git a/src/accessor/grib_accessor_class_scale.cc b/src/accessor/grib_accessor_class_scale.cc
new file mode 100644
index 000000000..a90f31862
--- /dev/null
+++ b/src/accessor/grib_accessor_class_scale.cc
@@ -0,0 +1,134 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_scale.h"
+
+grib_accessor_class_scale_t _grib_accessor_class_scale{"scale"};
+grib_accessor_class* grib_accessor_class_scale = &_grib_accessor_class_scale;
+
+
+void grib_accessor_class_scale_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_scale_t* self = (grib_accessor_scale_t*)a;
+    int n                     = 0;
+
+    self->value      = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->multiplier = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->divisor    = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->truncating = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+}
+
+int grib_accessor_class_scale_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_scale_t* self = (grib_accessor_scale_t*)a;
+    int ret                   = 0;
+    long value                = 0;
+    long multiplier           = 0;
+    long divisor              = 0;
+
+    if (*len < 1) {
+        ret = GRIB_ARRAY_TOO_SMALL;
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "Accessor %s cannot gather value for %s and/or %s",
+                         a->name, self->multiplier, self->divisor);
+        return ret;
+    }
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->divisor, &divisor)) != GRIB_SUCCESS)
+        return ret;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->multiplier, &multiplier)) != GRIB_SUCCESS)
+        return ret;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->value, &value)) != GRIB_SUCCESS)
+        return ret;
+
+    if (value == GRIB_MISSING_LONG)
+        *val = GRIB_MISSING_DOUBLE;
+    else
+        *val = ((double)(value * multiplier)) / divisor;
+
+    if (ret == GRIB_SUCCESS)
+        *len = 1;
+
+    return ret;
+}
+
+int grib_accessor_class_scale_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    const double dval = (double)*val;
+    return pack_double(a, &dval, len);
+}
+
+int grib_accessor_class_scale_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_scale_t* self = (grib_accessor_scale_t*)a;
+    int ret                   = 0;
+
+    long value      = 0;
+    long divisor    = 0;
+    long multiplier = 0;
+    long truncating = 0;
+    double x;
+
+    ret = grib_get_long_internal(grib_handle_of_accessor(a), self->divisor, &divisor);
+    if (ret != GRIB_SUCCESS) return ret;
+
+    ret = grib_get_long_internal(grib_handle_of_accessor(a), self->multiplier, &multiplier);
+    if (ret != GRIB_SUCCESS) return ret;
+
+    if (self->truncating) {
+        ret = grib_get_long_internal(grib_handle_of_accessor(a), self->truncating, &truncating);
+        if (ret != GRIB_SUCCESS) return ret;
+    }
+
+    if (multiplier == 0) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "Accessor %s: cannot divide by a zero multiplier %s",
+                         a->name, self->multiplier);
+        return GRIB_ENCODING_ERROR;
+    }
+
+    x = *val * (double)divisor / (double)multiplier;
+    if (*val == GRIB_MISSING_DOUBLE)
+        value = GRIB_MISSING_LONG;
+    else if (truncating) {
+        value = (long)x;
+    }
+    else {
+        value = x > 0 ? (long)(x + 0.5) : (long)(x - 0.5);
+    }
+
+    ret = grib_set_long_internal(grib_handle_of_accessor(a), self->value, value);
+    if (ret)
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "Accessor %s: cannot pack value for %s (%s)\n",
+                         a->name, self->value, grib_get_error_message(ret));
+
+    if (ret == GRIB_SUCCESS)
+        *len = 1;
+
+    return ret;
+}
+
+int grib_accessor_class_scale_t::is_missing(grib_accessor* a){
+    grib_accessor_scale_t* self = (grib_accessor_scale_t*)a;
+    grib_accessor* av         = grib_find_accessor(grib_handle_of_accessor(a), self->value);
+
+    if (!av)
+        return GRIB_NOT_FOUND;
+    return av->is_missing_internal();
+    //     int ret=0;
+    //     long value=0;
+    //     if((ret = grib_get_long_internal(grib_handle_of_accessor(a),self->value, &value))!= GRIB_SUCCESS){
+    //         grib_context_log(a->context, GRIB_LOG_ERROR,
+    //         "Accessor %s cannot gather value for %s error %d \n", a->name,
+    //         self->value, ret);
+    //         return 0;
+    //     }
+    //     return (value == GRIB_MISSING_LONG);
+}
diff --git a/src/accessor/grib_accessor_class_scale.h b/src/accessor/grib_accessor_class_scale.h
new file mode 100644
index 000000000..7e1f0d80d
--- /dev/null
+++ b/src/accessor/grib_accessor_class_scale.h
@@ -0,0 +1,39 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_scale_h
+#define eccodes_accessor_scale_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_double.h"
+
+class grib_accessor_scale_t : public grib_accessor_double_t
+{
+public:
+    /* Members defined in scale */
+    const char*    value;
+    const char*    multiplier;
+    const char*    divisor;
+    const char*    truncating;
+};
+
+class grib_accessor_class_scale_t : public grib_accessor_class_double_t
+{
+public:
+    grib_accessor_class_scale_t(const char* name) : grib_accessor_class_double_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_scale_t{}; }
+    int is_missing(grib_accessor*) override;
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_scale_h */
diff --git a/src/accessor/grib_accessor_class_scale_values.cc b/src/accessor/grib_accessor_class_scale_values.cc
new file mode 100644
index 000000000..0496bd1e4
--- /dev/null
+++ b/src/accessor/grib_accessor_class_scale_values.cc
@@ -0,0 +1,85 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_scale_values.h"
+
+grib_accessor_class_scale_values_t _grib_accessor_class_scale_values{"scale_values"};
+grib_accessor_class* grib_accessor_class_scale_values = &_grib_accessor_class_scale_values;
+
+
+void grib_accessor_class_scale_values_t::init(grib_accessor* a, const long l, grib_arguments* args){
+    int n                            = 0;
+    grib_accessor_scale_values_t* self = (grib_accessor_scale_values_t*)a;
+    self->values                     = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
+    self->missingValue               = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
+    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
+    a->length = 0;
+}
+
+int grib_accessor_class_scale_values_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    int ret = 0;
+    *val    = 1;
+    *len    = 1;
+    return ret;
+}
+
+int grib_accessor_class_scale_values_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    double* values            = NULL;
+    double missingValue       = 0;
+    long missingValuesPresent = 0;
+    size_t size               = 0;
+    int ret = 0, i = 0;
+    grib_accessor_scale_values_t* self = (grib_accessor_scale_values_t*)a;
+    const grib_context* c            = a->context;
+    grib_handle* h                   = grib_handle_of_accessor(a);
+
+    if (*val == 1)
+        return GRIB_SUCCESS;
+
+    if ((ret = grib_get_double_internal(h, self->missingValue, &missingValue)) != GRIB_SUCCESS) {
+        return ret;
+    }
+    if ((ret = grib_get_long_internal(h, "missingValuesPresent", &missingValuesPresent)) != GRIB_SUCCESS) {
+        return ret;
+    }
+
+    if ((ret = grib_get_size(h, self->values, &size)) != GRIB_SUCCESS)
+        return ret;
+
+    values = (double*)grib_context_malloc(c, size * sizeof(double));
+    if (!values)
+        return GRIB_OUT_OF_MEMORY;
+
+    if ((ret = grib_get_double_array_internal(h, self->values, values, &size)) != GRIB_SUCCESS) {
+        grib_context_free(c, values);
+        return ret;
+    }
+
+    for (i = 0; i < size; i++) {
+        if (missingValuesPresent) {
+            if (values[i] != missingValue)
+                values[i] *= *val;
+        }
+        else {
+            values[i] *= *val;
+        }
+    }
+
+    if ((ret = grib_set_double_array_internal(h, self->values, values, size)) != GRIB_SUCCESS) {
+        grib_context_free(c, values);
+        return ret;
+    }
+
+    grib_context_free(c, values);
+
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_scale_values.h b/src/accessor/grib_accessor_class_scale_values.h
new file mode 100644
index 000000000..cb94e16b8
--- /dev/null
+++ b/src/accessor/grib_accessor_class_scale_values.h
@@ -0,0 +1,35 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_scale_values_h
+#define eccodes_accessor_scale_values_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_double.h"
+
+class grib_accessor_scale_values_t : public grib_accessor_double_t
+{
+public:
+    /* Members defined in scale_values */
+    const char* values;
+    const char* missingValue;
+};
+
+class grib_accessor_class_scale_values_t : public grib_accessor_class_double_t
+{
+public:
+    grib_accessor_class_scale_values_t(const char* name) : grib_accessor_class_double_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_scale_values_t{}; }
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_scale_values_h */
diff --git a/src/accessor/todo/grib_accessor_class_second_order_bits_per_value.cc b/src/accessor/grib_accessor_class_second_order_bits_per_value.cc
similarity index 51%
rename from src/accessor/todo/grib_accessor_class_second_order_bits_per_value.cc
rename to src/accessor/grib_accessor_class_second_order_bits_per_value.cc
index 74c4b4c05..a42496716 100644
--- a/src/accessor/todo/grib_accessor_class_second_order_bits_per_value.cc
+++ b/src/accessor/grib_accessor_class_second_order_bits_per_value.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,108 +9,13 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-/**********************************
- *  Enrico Fucile
- **********************************/
-
-#include "grib_scaling.h"
 #include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = pack_long
-   IMPLEMENTS = init
-   MEMBERS = const char* values
-   MEMBERS = const char* binaryScaleFactor
-   MEMBERS = const char* decimalScaleFactor
-   MEMBERS = long bitsPerValue
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_second_order_bits_per_value
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in second_order_bits_per_value */
-    const char* values;
-    const char* binaryScaleFactor;
-    const char* decimalScaleFactor;
-    long bitsPerValue;
-} grib_accessor_second_order_bits_per_value;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_second_order_bits_per_value = {
-    &grib_accessor_class_long,                      /* super */
-    "second_order_bits_per_value",                      /* name */
-    sizeof(grib_accessor_second_order_bits_per_value),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_second_order_bits_per_value.h"
+#include "grib_scaling.h"
 
+grib_accessor_class_second_order_bits_per_value_t _grib_accessor_class_second_order_bits_per_value{"second_order_bits_per_value"};
 grib_accessor_class* grib_accessor_class_second_order_bits_per_value = &_grib_accessor_class_second_order_bits_per_value;
 
-/* END_CLASS_IMP */
 
 static const size_t nbits[64] = {
     0x1, 0x2, 0x4, 0x8,
@@ -130,8 +36,7 @@ static const size_t nbits[64] = {
     0x1000000000000000, 0x2000000000000000, 0x4000000000000000, 0x8000000000000000
 };
 
-static int number_of_bits(size_t x, long* result)
-{
+int number_of_bits(size_t x, long* result){
     const size_t* n = nbits;
     const int count = sizeof(nbits) / sizeof(nbits[0]);
     *result         = 0;
@@ -145,10 +50,9 @@ static int number_of_bits(size_t x, long* result)
     return GRIB_SUCCESS;
 }
 
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
+void grib_accessor_class_second_order_bits_per_value_t::init(grib_accessor* a, const long l, grib_arguments* c){
     int n                                           = 0;
-    grib_accessor_second_order_bits_per_value* self = (grib_accessor_second_order_bits_per_value*)a;
+    grib_accessor_second_order_bits_per_value_t* self = (grib_accessor_second_order_bits_per_value_t*)a;
     self->values                                    = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
     self->binaryScaleFactor                         = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
     self->decimalScaleFactor                        = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
@@ -157,17 +61,15 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
     a->length = 0;
 }
 
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_second_order_bits_per_value* self = (grib_accessor_second_order_bits_per_value*)a;
+int grib_accessor_class_second_order_bits_per_value_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_second_order_bits_per_value_t* self = (grib_accessor_second_order_bits_per_value_t*)a;
     self->bitsPerValue                              = (long)*val;
     *len                                            = 1;
 
     return 0;
 }
 
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
+int grib_accessor_class_second_order_bits_per_value_t::unpack_long(grib_accessor* a, long* val, size_t* len){
     int ret     = GRIB_SUCCESS;
     size_t size = 0;
     size_t i;
@@ -175,7 +77,7 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
     double* values = 0;
     long binaryScaleFactor, decimalScaleFactor;
 
-    grib_accessor_second_order_bits_per_value* self = (grib_accessor_second_order_bits_per_value*)a;
+    grib_accessor_second_order_bits_per_value_t* self = (grib_accessor_second_order_bits_per_value_t*)a;
     if (self->bitsPerValue) {
         *val = self->bitsPerValue;
         return GRIB_SUCCESS;
diff --git a/src/accessor/grib_accessor_class_second_order_bits_per_value.h b/src/accessor/grib_accessor_class_second_order_bits_per_value.h
new file mode 100644
index 000000000..370b364dd
--- /dev/null
+++ b/src/accessor/grib_accessor_class_second_order_bits_per_value.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_second_order_bits_per_value_h
+#define eccodes_accessor_second_order_bits_per_value_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_second_order_bits_per_value_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in second_order_bits_per_value */
+    const char* values;
+    const char* binaryScaleFactor;
+    const char* decimalScaleFactor;
+    long bitsPerValue;
+};
+
+class grib_accessor_class_second_order_bits_per_value_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_second_order_bits_per_value_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_second_order_bits_per_value_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_second_order_bits_per_value_h */
diff --git a/src/accessor/grib_accessor_class_section.cc b/src/accessor/grib_accessor_class_section.cc
new file mode 100644
index 000000000..b6222a551
--- /dev/null
+++ b/src/accessor/grib_accessor_class_section.cc
@@ -0,0 +1,95 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_section.h"
+
+grib_accessor_class_section_t _grib_accessor_class_section{"section"};
+grib_accessor_class* grib_accessor_class_section = &_grib_accessor_class_section;
+
+
+void grib_accessor_class_section_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    a->sub_section = grib_section_create(grib_handle_of_accessor(a), a);
+    a->length      = 0;
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+}
+
+void grib_accessor_class_section_t::dump(grib_accessor* a, grib_dumper* dumper){
+    grib_dump_section(dumper, a, a->sub_section->block);
+}
+
+long grib_accessor_class_section_t::byte_count(grib_accessor* a){
+    if (!a->length || grib_handle_of_accessor(a)->loader) {
+        if (a->name[1] == '_')
+            return 0;
+
+        /* printf("adjusting sizes SECTION %s is %ld %ld\n",a->name,(long)a->offset,(long)a->length); */
+        grib_section_adjust_sizes(a->sub_section, grib_handle_of_accessor(a)->loader != NULL, 0);
+        /* printf("                SECTION %s is %ld %ld\n",a->name,(long)a->offset,(long)a->length);  */
+    }
+
+    /* printf("SECTION %s is %ld %d\n",a->name,a->length,a->sub_section->aclength != NULL);  */
+    return a->length;
+}
+
+long grib_accessor_class_section_t::next_offset(grib_accessor* a){
+    return a->offset + byte_count(a);
+}
+
+void grib_accessor_class_section_t::destroy(grib_context* ct, grib_accessor* a){
+    grib_section_delete(ct, a->sub_section);
+}
+
+int grib_accessor_class_section_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_SECTION;
+}
+
+static grib_section* sub_section(grib_accessor* a)
+{
+    return a->sub_section;
+}
+
+void grib_accessor_class_section_t::update_size(grib_accessor* a, size_t length){
+    size_t size = 1;
+    long len    = length;
+    Assert(length <= 0x7fffffff);
+    if (a->sub_section->aclength) {
+        int e = a->sub_section->aclength->pack_long(&len, &size);        Assert(e == GRIB_SUCCESS);
+        // printf("update_length %s %ld %ld\n", a->sub_section->aclength->name,
+        //        (long)a->sub_section->aclength->offset,
+        //        (long)a->sub_section->aclength->length);
+    }
+
+    a->sub_section->length = a->length = length;
+    a->sub_section->padding            = 0;
+
+    // printf("update_size %s %ld\n", a->name, a->length);
+
+    Assert(a->length >= 0);
+}
+
+static grib_accessor* next(grib_accessor* a, int explore)
+{
+    grib_accessor* next = NULL;
+    if (explore) {
+        next = a->sub_section->block->first;
+        if (!next)
+            next = a->next;
+    }
+    else {
+        next = a->next;
+    }
+    if (!next) {
+        if (a->parent->owner)
+            next = a->parent->owner->cclass->next(a->parent->owner, 0);
+    }
+    return next;
+}
diff --git a/src/accessor/grib_accessor_class_section.h b/src/accessor/grib_accessor_class_section.h
new file mode 100644
index 000000000..b755b8b27
--- /dev/null
+++ b/src/accessor/grib_accessor_class_section.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_section_h
+#define eccodes_accessor_section_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_section_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in section */
+};
+
+class grib_accessor_class_section_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_section_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_section_t{}; }
+    int get_native_type(grib_accessor*) override;
+    long byte_count(grib_accessor*) override;
+    long next_offset(grib_accessor*) override;
+    void destroy(grib_context*, grib_accessor*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    void update_size(grib_accessor*, size_t) override;
+};
+#endif /* eccodes_accessor_section_h */
diff --git a/src/accessor/grib_accessor_class_section_length.cc b/src/accessor/grib_accessor_class_section_length.cc
new file mode 100644
index 000000000..4d78f5f19
--- /dev/null
+++ b/src/accessor/grib_accessor_class_section_length.cc
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_section_length.h"
+
+grib_accessor_class_section_length_t _grib_accessor_class_section_length{"section_length"};
+grib_accessor_class* grib_accessor_class_section_length = &_grib_accessor_class_section_length;
+
+
+void grib_accessor_class_section_length_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    a->parent->aclength = a;
+    a->length           = len;
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->flags |= GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC;
+    Assert(a->length >= 0);
+}
+
+void grib_accessor_class_section_length_t::dump(grib_accessor* a, grib_dumper* dumper){
+    grib_dump_long(dumper, a, NULL);
+}
+
+int grib_accessor_class_section_length_t::value_count(grib_accessor* a, long* c){
+    *c = 1;
+    return 0;
+}
diff --git a/src/accessor/grib_accessor_class_section_length.h b/src/accessor/grib_accessor_class_section_length.h
new file mode 100644
index 000000000..09490bebd
--- /dev/null
+++ b/src/accessor/grib_accessor_class_section_length.h
@@ -0,0 +1,33 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_section_length_h
+#define eccodes_accessor_section_length_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_unsigned.h"
+
+class grib_accessor_section_length_t : public grib_accessor_unsigned_t
+{
+public:
+    /* Members defined in section_length */
+};
+
+class grib_accessor_class_section_length_t : public grib_accessor_class_unsigned_t
+{
+public:
+    grib_accessor_class_section_length_t(const char* name) : grib_accessor_class_unsigned_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_section_length_t{}; }
+    int value_count(grib_accessor*, long*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_section_length_h */
diff --git a/src/accessor/grib_accessor_class_section_padding.cc b/src/accessor/grib_accessor_class_section_padding.cc
new file mode 100644
index 000000000..53cd22c06
--- /dev/null
+++ b/src/accessor/grib_accessor_class_section_padding.cc
@@ -0,0 +1,70 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_section_padding.h"
+
+grib_accessor_class_section_padding_t _grib_accessor_class_section_padding{"section_padding"};
+grib_accessor_class* grib_accessor_class_section_padding = &_grib_accessor_class_section_padding;
+
+
+size_t grib_accessor_class_section_padding_t::preferred_size(grib_accessor* a, int from_handle){
+    grib_accessor_section_padding_t* self = (grib_accessor_section_padding_t*)a;
+    grib_accessor* b                    = a;
+    grib_accessor* section_length       = 0;
+    long length                         = 0;
+    size_t size                         = 1;
+
+    long alength = 0;
+
+    if (!from_handle) {
+        if (self->preserve)
+            return a->length;
+        else
+            return 0;
+    }
+
+    /* The section length should be a parameter */
+    while (section_length == NULL && b != NULL) {
+        section_length = b->parent->aclength;
+        b              = b->parent->owner;
+    }
+
+    if (!section_length) {
+        /* printf("PADDING is no !section_length\n"); */
+        return 0;
+    }
+
+    if (section_length->unpack_long(&length, &size) == GRIB_SUCCESS) {
+        if (length)
+            alength = length - a->offset + section_length->parent->owner->offset;
+        else
+            alength = 0;
+
+        /*Assert(a->length>=0);*/
+
+        if (alength < 0)
+            alength = 0;
+
+        /* printf("PADDING is %ld\n",a->length); */
+    }
+    else {
+        /* printf("PADDING unpack fails\n"); */
+    }
+
+    return alength;
+}
+
+void grib_accessor_class_section_padding_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    grib_accessor_section_padding_t* self = (grib_accessor_section_padding_t*)a;
+    self->preserve                      = 1; /* This should be a parameter */
+    a->length                           = preferred_size(a, 1);
+}
diff --git a/src/accessor/grib_accessor_class_section_padding.h b/src/accessor/grib_accessor_class_section_padding.h
new file mode 100644
index 000000000..b6fce7f34
--- /dev/null
+++ b/src/accessor/grib_accessor_class_section_padding.h
@@ -0,0 +1,33 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_section_padding_h
+#define eccodes_accessor_section_padding_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_padding.h"
+
+class grib_accessor_section_padding_t : public grib_accessor_padding_t
+{
+public:
+    /* Members defined in section_padding */
+    int preserve;
+};
+
+class grib_accessor_class_section_padding_t : public grib_accessor_class_padding_t
+{
+public:
+    grib_accessor_class_section_padding_t(const char* name) : grib_accessor_class_padding_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_section_padding_t{}; }
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    size_t preferred_size(grib_accessor*, int) override;
+};
+#endif /* eccodes_accessor_section_padding_h */
diff --git a/src/accessor/grib_accessor_class_section_pointer.cc b/src/accessor/grib_accessor_class_section_pointer.cc
new file mode 100644
index 000000000..553deb30f
--- /dev/null
+++ b/src/accessor/grib_accessor_class_section_pointer.cc
@@ -0,0 +1,97 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_section_pointer.h"
+
+grib_accessor_class_section_pointer_t _grib_accessor_class_section_pointer{"section_pointer"};
+grib_accessor_class* grib_accessor_class_section_pointer = &_grib_accessor_class_section_pointer;
+
+
+void grib_accessor_class_section_pointer_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    int n = 0;
+    grib_accessor_section_pointer_t* self = (grib_accessor_section_pointer_t*)a;
+
+    self->sectionOffset = grib_arguments_get_name(grib_handle_of_accessor(a), arg, n++);
+    self->sectionLength = grib_arguments_get_name(grib_handle_of_accessor(a), arg, n++);
+    self->sectionNumber = grib_arguments_get_long(grib_handle_of_accessor(a), arg, n++);
+
+    Assert(self->sectionNumber < MAX_NUM_SECTIONS);
+
+    grib_handle_of_accessor(a)->section_offset[self->sectionNumber] = (char*)self->sectionOffset;
+    grib_handle_of_accessor(a)->section_length[self->sectionNumber] = (char*)self->sectionLength;
+
+    /* printf("++++++++++++++ GRIB_API:  creating section_pointer%d %s %s\n", */
+    /* self->sectionNumber,self->sectionLength,self->sectionLength); */
+
+    if (grib_handle_of_accessor(a)->sections_count < self->sectionNumber)
+        grib_handle_of_accessor(a)->sections_count = self->sectionNumber;
+
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->flags |= GRIB_ACCESSOR_FLAG_HIDDEN;
+    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
+    a->flags |= GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC;
+    a->length = 0;
+}
+
+int grib_accessor_class_section_pointer_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_BYTES;
+}
+
+int grib_accessor_class_section_pointer_t::unpack_string(grib_accessor* a, char* v, size_t* len){
+    /*
+      unsigned char* p=NULL;
+      char* s=v;
+      int i;
+      long length=a->byte_count();
+      if (*len < length) return GRIB_ARRAY_TOO_SMALL;
+
+      p  = grib_handle_of_accessor(a)->buffer->data + a->byte_offset();
+      for (i = 0; i < length; i++)  {
+        snprintf (s,64,"%02x", *(p++));
+        s+=2;
+      }
+      *len=length;
+    */
+    snprintf(v, 64, "%ld_%ld", a->byte_offset(), a->byte_count());    return GRIB_SUCCESS;
+}
+
+long grib_accessor_class_section_pointer_t::byte_count(grib_accessor* a){
+    grib_accessor_section_pointer_t* self = (grib_accessor_section_pointer_t*)a;
+    long sectionLength = 0;
+    int ret = 0;
+
+    ret = grib_get_long(grib_handle_of_accessor(a), self->sectionLength, &sectionLength);
+    if (ret) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "Unable to get %s %s",
+                         self->sectionLength, grib_get_error_message(ret));
+        return -1;
+    }
+
+    return sectionLength;
+}
+
+long grib_accessor_class_section_pointer_t::byte_offset(grib_accessor* a){
+    grib_accessor_section_pointer_t* self = (grib_accessor_section_pointer_t*)a;
+    long sectionOffset = 0;
+    int ret = 0;
+
+    ret = grib_get_long(grib_handle_of_accessor(a), self->sectionOffset, &sectionOffset);
+    if (ret) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "Unable to get %s %s",
+                         self->sectionOffset, grib_get_error_message(ret));
+        return -1;
+    }
+
+    return sectionOffset;
+}
diff --git a/src/accessor/grib_accessor_class_section_pointer.h b/src/accessor/grib_accessor_class_section_pointer.h
new file mode 100644
index 000000000..45e77fbb9
--- /dev/null
+++ b/src/accessor/grib_accessor_class_section_pointer.h
@@ -0,0 +1,38 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_section_pointer_h
+#define eccodes_accessor_section_pointer_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_section_pointer_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in section_pointer */
+    const char* sectionOffset;
+    const char* sectionLength;
+    long sectionNumber;
+};
+
+class grib_accessor_class_section_pointer_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_section_pointer_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_section_pointer_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    long byte_count(grib_accessor*) override;
+    long byte_offset(grib_accessor*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_section_pointer_h */
diff --git a/src/accessor/todo/grib_accessor_class_select_step_template.cc b/src/accessor/grib_accessor_class_select_step_template.cc
similarity index 60%
rename from src/accessor/todo/grib_accessor_class_select_step_template.cc
rename to src/accessor/grib_accessor_class_select_step_template.cc
index 7a0e76c23..fd4578d41 100644
--- a/src/accessor/todo/grib_accessor_class_select_step_template.cc
+++ b/src/accessor/grib_accessor_class_select_step_template.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,107 +10,14 @@
  */
 
 #include "grib_api_internal.h"
+#include "grib_accessor_class_select_step_template.h"
 
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_unsigned
-   IMPLEMENTS = unpack_long;pack_long; value_count
-   IMPLEMENTS = init
-   MEMBERS=const char*    productDefinitionTemplateNumber
-   MEMBERS=int            instant
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_select_step_template
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in unsigned */
-    long nbytes;
-    grib_arguments* arg;
-    /* Members defined in select_step_template */
-    const char*    productDefinitionTemplateNumber;
-    int            instant;
-} grib_accessor_select_step_template;
-
-extern grib_accessor_class* grib_accessor_class_unsigned;
-
-static grib_accessor_class _grib_accessor_class_select_step_template = {
-    &grib_accessor_class_unsigned,                      /* super */
-    "select_step_template",                      /* name */
-    sizeof(grib_accessor_select_step_template),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
+grib_accessor_class_select_step_template_t _grib_accessor_class_select_step_template{"select_step_template"};
 grib_accessor_class* grib_accessor_class_select_step_template = &_grib_accessor_class_select_step_template;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_select_step_template* self = (grib_accessor_select_step_template*)a;
+void grib_accessor_class_select_step_template_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_select_step_template_t* self = (grib_accessor_select_step_template_t*)a;
     grib_handle* hand = grib_handle_of_accessor(a);
     int n = 0;
 
@@ -117,15 +25,13 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
     self->instant                         = grib_arguments_get_long(hand, c, n++);
 }
 
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
+int grib_accessor_class_select_step_template_t::unpack_long(grib_accessor* a, long* val, size_t* len){
     *val = 1;
     return GRIB_SUCCESS;
 }
 
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_select_step_template* self = (grib_accessor_select_step_template*)a;
+int grib_accessor_class_select_step_template_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_select_step_template_t* self = (grib_accessor_select_step_template_t*)a;
     grib_handle* hand = grib_handle_of_accessor(a);
     long productDefinitionTemplateNumber     = 0;
     long productDefinitionTemplateNumberNew  = 0;
@@ -266,8 +172,7 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int value_count(grib_accessor* a, long* c)
-{
+int grib_accessor_class_select_step_template_t::value_count(grib_accessor* a, long* c){
     *c = 1;
     return 0;
 }
diff --git a/src/accessor/grib_accessor_class_select_step_template.h b/src/accessor/grib_accessor_class_select_step_template.h
new file mode 100644
index 000000000..a83d3ddfd
--- /dev/null
+++ b/src/accessor/grib_accessor_class_select_step_template.h
@@ -0,0 +1,36 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_select_step_template_h
+#define eccodes_accessor_select_step_template_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_unsigned.h"
+
+class grib_accessor_select_step_template_t : public grib_accessor_unsigned_t
+{
+public:
+    /* Members defined in select_step_template */
+    const char*    productDefinitionTemplateNumber;
+    int            instant;
+};
+
+class grib_accessor_class_select_step_template_t : public grib_accessor_class_unsigned_t
+{
+public:
+    grib_accessor_class_select_step_template_t(const char* name) : grib_accessor_class_unsigned_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_select_step_template_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_select_step_template_h */
diff --git a/src/accessor/grib_accessor_class_sexagesimal2decimal.cc b/src/accessor/grib_accessor_class_sexagesimal2decimal.cc
new file mode 100644
index 000000000..7b3a7dbfb
--- /dev/null
+++ b/src/accessor/grib_accessor_class_sexagesimal2decimal.cc
@@ -0,0 +1,146 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_sexagesimal2decimal.h"
+
+grib_accessor_class_sexagesimal2decimal_t _grib_accessor_class_sexagesimal2decimal{"sexagesimal2decimal"};
+grib_accessor_class* grib_accessor_class_sexagesimal2decimal = &_grib_accessor_class_sexagesimal2decimal;
+
+
+void grib_accessor_class_sexagesimal2decimal_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+}
+
+void grib_accessor_class_sexagesimal2decimal_t::dump(grib_accessor* a, grib_dumper* dumper){
+    grib_dump_double(dumper, a, NULL);
+}
+
+int grib_accessor_class_sexagesimal2decimal_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_DOUBLE;
+}
+
+int grib_accessor_class_sexagesimal2decimal_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    int err                                 = 0;
+    grib_accessor_sexagesimal2decimal_t* self = (grib_accessor_sexagesimal2decimal_t*)a;
+    char buff[512]                          = {0,};
+    size_t length = 0;
+    size_t size   = 512;
+    char* p;
+    char* q;
+    double dd, mm = 0, ss = 0;
+    int dd_sign = 1;
+
+    err = grib_get_string(grib_handle_of_accessor(a), self->key, buff, &size);
+    if (err)
+        return err;
+    q = buff + self->start;
+    if (self->length)
+        q[length] = 0;
+    p = q;
+
+    while (*p != '-' && *p != ':' && *p != ' ' && *p != 0) {
+        p++;
+    }
+
+    if (*p == 0) {
+        return GRIB_WRONG_CONVERSION;
+    }
+    *p = 0;
+
+    dd = atoi(q);
+    p++;
+    q = p;
+    while (*p != '-' && *p != ':' && *p != ' ' && *p != 'N' && *p != 'S' && *p != 'E' && *p != 'W' && *p != 0) {
+        p++;
+    }
+    switch (*p) {
+        case ' ':
+        case '-':
+        case ':':
+            *p = 0;
+            mm = atoi(q) / 60.0;
+            dd += mm;
+            p++;
+            q = p;
+            break;
+        case 'N':
+        case 'E':
+            *p      = 0;
+            dd_sign = 1;
+            mm      = atoi(q) / 60.0;
+            dd += mm;
+            p++;
+            q = p;
+            break;
+        case 'S':
+        case 'W':
+            *p = 0;
+            mm = atoi(q) / 60.0;
+            dd += mm;
+            dd_sign = -1;
+            p++;
+            q = p;
+            break;
+        case 0:
+            break;
+        default:
+            return GRIB_WRONG_CONVERSION;
+    }
+    if (*p) {
+        while (*p != '-' && *p != ':' && *p != ' ' && *p != 'N' && *p != 'S' && *p != 'E' && *p != 'W' && *p != 0) {
+            p++;
+        }
+        switch (*p) {
+            case ' ':
+            case '-':
+            case ':':
+                *p = 0;
+                ss = atof(q) / 60.0;
+                dd += ss;
+                break;
+            case 'N':
+            case 'E':
+                *p = 0;
+                ss = atof(q) / 60.0;
+                dd += ss;
+                dd_sign = 1;
+                break;
+            case 'S':
+            case 'W':
+                *p = 0;
+                ss = atof(q) / 60.0;
+                dd += ss;
+                dd_sign = -1;
+                break;
+            case 0:
+                break;
+            default:
+                return GRIB_WRONG_CONVERSION;
+        }
+    }
+    dd *= dd_sign;
+
+    snprintf(buff, sizeof(buff), "%.2f", dd);
+    length = strlen(buff);
+
+    if (len[0] < length + 1) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "unpack_string: Wrong size (%lu) for %s, it contains %ld values",
+                len[0], a->name, a->length + 1);
+        len[0] = 0;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    strcpy(val, buff);
+
+    len[0] = length;
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_sexagesimal2decimal.h b/src/accessor/grib_accessor_class_sexagesimal2decimal.h
new file mode 100644
index 000000000..c9009293e
--- /dev/null
+++ b/src/accessor/grib_accessor_class_sexagesimal2decimal.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_sexagesimal2decimal_h
+#define eccodes_accessor_sexagesimal2decimal_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_to_double.h"
+
+class grib_accessor_sexagesimal2decimal_t : public grib_accessor_to_double_t
+{
+public:
+    /* Members defined in sexagesimal2decimal */
+};
+
+class grib_accessor_class_sexagesimal2decimal_t : public grib_accessor_class_to_double_t
+{
+public:
+    grib_accessor_class_sexagesimal2decimal_t(const char* name) : grib_accessor_class_to_double_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_sexagesimal2decimal_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_sexagesimal2decimal_h */
diff --git a/src/accessor/todo/grib_accessor_class_signed.cc b/src/accessor/grib_accessor_class_signed.cc
similarity index 51%
rename from src/accessor/todo/grib_accessor_class_signed.cc
rename to src/accessor/grib_accessor_class_signed.cc
index 3439934e1..ac2f7757c 100644
--- a/src/accessor/todo/grib_accessor_class_signed.cc
+++ b/src/accessor/grib_accessor_class_signed.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,129 +10,25 @@
  */
 
 #include "grib_api_internal.h"
+#include "grib_accessor_class_signed.h"
 
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long;pack_long
-   IMPLEMENTS = init;dump
-   IMPLEMENTS = next_offset
-   IMPLEMENTS = byte_count
-   IMPLEMENTS = value_count
-   IMPLEMENTS = byte_offset
-   IMPLEMENTS = update_size; is_missing
-   MEMBERS    = grib_arguments* arg
-   MEMBERS    = int nbytes;
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int is_missing(grib_accessor*);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static long byte_count(grib_accessor*);
-static long byte_offset(grib_accessor*);
-static long next_offset(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static void update_size(grib_accessor*, size_t);
-
-typedef struct grib_accessor_signed
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in signed */
-    grib_arguments* arg;
-    int nbytes;
-} grib_accessor_signed;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_signed = {
-    &grib_accessor_class_long,                      /* super */
-    "signed",                      /* name */
-    sizeof(grib_accessor_signed),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    &next_offset,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    &byte_count,                 /* get number of bytes */
-    &byte_offset,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    &is_missing,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    &update_size,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
+grib_accessor_class_signed_t _grib_accessor_class_signed{"signed"};
 grib_accessor_class* grib_accessor_class_signed = &_grib_accessor_class_signed;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    grib_accessor_signed* self = (grib_accessor_signed*)a;
+void grib_accessor_class_signed_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    grib_accessor_signed_t* self = (grib_accessor_signed_t*)a;
     long count                 = 0;
 
     self->arg = arg;
-    grib_value_count(a, &count);
-    a->length    = len * count;
+    a->value_count(&count);    a->length    = len * count;
     self->nbytes = len;
     Assert(a->length >= 0);
 }
 
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
+void grib_accessor_class_signed_t::dump(grib_accessor* a, grib_dumper* dumper){
     long rlen = 0;
-    grib_value_count(a, &rlen);
-    if (rlen == 1)
+    a->value_count(&rlen);    if (rlen == 1)
         grib_dump_long(dumper, a, NULL);
     else
         grib_dump_values(dumper, a);
@@ -145,9 +42,8 @@ static const long ones[] = {
     -0x7fffffff,
 };
 
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_signed* self = (grib_accessor_signed*)a;
+int grib_accessor_class_signed_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_signed_t* self = (grib_accessor_signed_t*)a;
     unsigned long rlen         = 0;
     int err                    = 0;
     long count                 = 0;
@@ -156,8 +52,7 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
     long pos                   = a->offset;
     long missing               = 0;
 
-    err = grib_value_count(a, &count);
-    if (err)
+    err = a->value_count(&count);    if (err)
         return err;
     rlen = count;
 
@@ -184,9 +79,8 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_signed* self = (grib_accessor_signed*)a;
+int grib_accessor_class_signed_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_signed_t* self = (grib_accessor_signed_t*)a;
     int ret                    = 0;
     long off                   = 0;
     unsigned long rlen         = 0;
@@ -197,8 +91,7 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
     unsigned long i            = 0;
     long missing               = 0;
 
-    err = grib_value_count(a, &count);
-    if (err)
+    err = a->value_count(&count);    if (err)
         return err;
     rlen = count;
 
@@ -237,7 +130,7 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
         if (ret == GRIB_SUCCESS)
             len[0] = 1;
         if (*len > 1)
-            grib_context_log(a->context, GRIB_LOG_WARNING, "grib_accessor_signed : Trying to pack %d values in a scalar %s, packing first value", *len, a->name);
+            grib_context_log(a->context, GRIB_LOG_WARNING, "grib_accessor_signed_t : Trying to pack %d values in a scalar %s, packing first value", *len, a->name);
         len[0] = 1;
         return ret;
     }
@@ -263,14 +156,12 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
     return ret;
 }
 
-static long byte_count(grib_accessor* a)
-{
+long grib_accessor_class_signed_t::byte_count(grib_accessor* a){
     return a->length;
 }
 
-static int value_count(grib_accessor* a, long* len)
-{
-    grib_accessor_signed* self = (grib_accessor_signed*)a;
+int grib_accessor_class_signed_t::value_count(grib_accessor* a, long* len){
+    grib_accessor_signed_t* self = (grib_accessor_signed_t*)a;
     *len                       = 0;
     if (!self->arg) {
         *len = 1;
@@ -279,24 +170,19 @@ static int value_count(grib_accessor* a, long* len)
     return grib_get_long_internal(grib_handle_of_accessor(a), grib_arguments_get_name(a->parent->h, self->arg, 0), len);
 }
 
-static long byte_offset(grib_accessor* a)
-{
+long grib_accessor_class_signed_t::byte_offset(grib_accessor* a){
     return a->offset;
 }
 
-static void update_size(grib_accessor* a, size_t s)
-{
+void grib_accessor_class_signed_t::update_size(grib_accessor* a, size_t s){
     a->length = s;
     Assert(a->length >= 0);
 }
 
-static long next_offset(grib_accessor* a)
-{
-    return grib_byte_offset(a) + grib_byte_count(a);
-}
+long grib_accessor_class_signed_t::next_offset(grib_accessor* a){
+    return a->byte_offset() + a->byte_count();}
 
-static int is_missing(grib_accessor* a)
-{
+int grib_accessor_class_signed_t::is_missing(grib_accessor* a){
     int i                = 0;
     unsigned char ff     = 0xff;
     unsigned long offset = a->offset;
diff --git a/src/accessor/grib_accessor_class_signed.h b/src/accessor/grib_accessor_class_signed.h
new file mode 100644
index 000000000..23c9829a4
--- /dev/null
+++ b/src/accessor/grib_accessor_class_signed.h
@@ -0,0 +1,42 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_signed_h
+#define eccodes_accessor_signed_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_signed_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in signed */
+    grib_arguments* arg;
+    int nbytes;
+};
+
+class grib_accessor_class_signed_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_signed_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_signed_t{}; }
+    int is_missing(grib_accessor*) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    long byte_count(grib_accessor*) override;
+    long byte_offset(grib_accessor*) override;
+    long next_offset(grib_accessor*) override;
+    int value_count(grib_accessor*, long*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    void update_size(grib_accessor*, size_t) override;
+};
+#endif /* eccodes_accessor_signed_h */
diff --git a/src/accessor/grib_accessor_class_signed_bits.cc b/src/accessor/grib_accessor_class_signed_bits.cc
new file mode 100644
index 000000000..85a764628
--- /dev/null
+++ b/src/accessor/grib_accessor_class_signed_bits.cc
@@ -0,0 +1,152 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_signed_bits.h"
+
+grib_accessor_class_signed_bits_t _grib_accessor_class_signed_bits{"signed_bits"};
+grib_accessor_class* grib_accessor_class_signed_bits = &_grib_accessor_class_signed_bits;
+
+
+long grib_accessor_class_signed_bits_t::byte_count(grib_accessor* a){
+    return a->length;
+}
+
+static long compute_byte_count(grib_accessor* a){
+    grib_accessor_signed_bits_t* self = (grib_accessor_signed_bits_t*)a;
+    long numberOfBits;
+    long numberOfElements;
+    int ret = 0;
+
+    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfBits, &numberOfBits);
+    if (ret) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "%s unable to get %s to compute size", a->name, self->numberOfBits);
+        return 0;
+    }
+
+    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfElements, &numberOfElements);
+    if (ret) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "%s unable to get %s to compute size", a->name, self->numberOfElements);
+        return 0;
+    }
+
+    return (numberOfBits * numberOfElements + 7) / 8;
+}
+
+void grib_accessor_class_signed_bits_t::init(grib_accessor* a, const long len, grib_arguments* args){
+    grib_accessor_signed_bits_t* self = (grib_accessor_signed_bits_t*)a;
+    int n                           = 0;
+    self->numberOfBits              = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
+    self->numberOfElements          = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
+    a->length                       = compute_byte_count(a);
+}
+
+int grib_accessor_class_signed_bits_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    return GRIB_NOT_IMPLEMENTED;
+#if 0
+    grib_accessor_signed_bits_t* self = (grib_accessor_signed_bits_t*)a;
+    int i;
+    int ret           = 0;
+    long pos          = a->offset * 8;
+    long rlen         = 0;
+    long numberOfBits = 0;
+
+    ret = value_count(a, &rlen);
+    if (ret)
+        return ret;
+
+    if (*len < rlen) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "Wrong size (%ld) for %s it contains %ld values", *len, a->name, rlen);
+        *len = 0;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfBits, &numberOfBits);
+    if (ret)
+        return ret;
+
+    if (numberOfBits == 0) {
+        for (i = 0; i < rlen; i++)
+            val[i] = 0;
+        return GRIB_SUCCESS;
+    }
+
+    for (i = 0; i < rlen; i++)
+        val[i] = grib_decode_signed_longb(grib_handle_of_accessor(a)->buffer->data, &pos, numberOfBits);
+
+    *len = rlen;
+
+    return GRIB_SUCCESS;
+#endif
+}
+
+int grib_accessor_class_signed_bits_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    return GRIB_NOT_IMPLEMENTED;
+#if 0
+    grib_accessor_signed_bits_t* self = (grib_accessor_signed_bits_t*)a;
+    int ret                         = 0;
+    long off                        = 0;
+    long numberOfBits               = 0;
+    size_t buflen                   = 0;
+    unsigned char* buf              = NULL;
+    unsigned long i                 = 0;
+    unsigned long rlen              = 0;
+    long count                      = 0;
+
+    ret = value_count(a, &count);
+    if (ret)
+        return ret;
+    rlen = count;
+    if (*len != rlen) {
+        ret = grib_set_long(grib_handle_of_accessor(a), self->numberOfElements, rlen);
+        if (ret)
+            return ret;
+    }
+
+    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfBits, &numberOfBits);
+    if (ret)
+        return ret;
+
+    buflen = compute_byte_count(a);
+    buf    = (unsigned char*)grib_context_malloc_clear(a->context, buflen + sizeof(long));
+
+    for (i = 0; i < rlen; i++)
+        grib_encode_signed_longb(buf, val[i], &off, numberOfBits);
+
+    grib_buffer_replace(a, buf, buflen, 1, 1);
+
+    grib_context_free(a->context, buf);
+
+    return ret;
+#endif
+}
+
+int grib_accessor_class_signed_bits_t::value_count(grib_accessor* a, long* numberOfElements){
+    grib_accessor_signed_bits_t* self = (grib_accessor_signed_bits_t*)a;
+    *numberOfElements               = 0;
+
+    return grib_get_long(grib_handle_of_accessor(a), self->numberOfElements, numberOfElements);
+}
+
+long grib_accessor_class_signed_bits_t::byte_offset(grib_accessor* a){
+    return a->offset;
+}
+
+void grib_accessor_class_signed_bits_t::update_size(grib_accessor* a, size_t s){
+    a->length = s;
+}
+
+long grib_accessor_class_signed_bits_t::next_offset(grib_accessor* a){
+    return byte_offset(a) + byte_count(a);
+}
diff --git a/src/accessor/grib_accessor_class_signed_bits.h b/src/accessor/grib_accessor_class_signed_bits.h
new file mode 100644
index 000000000..96ba5f592
--- /dev/null
+++ b/src/accessor/grib_accessor_class_signed_bits.h
@@ -0,0 +1,40 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_signed_bits_h
+#define eccodes_accessor_signed_bits_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_signed_bits_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in signed_bits */
+    const char* numberOfBits;
+    const char* numberOfElements;
+};
+
+class grib_accessor_class_signed_bits_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_signed_bits_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_signed_bits_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    long byte_count(grib_accessor*) override;
+    long byte_offset(grib_accessor*) override;
+    long next_offset(grib_accessor*) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    void update_size(grib_accessor*, size_t) override;
+};
+#endif /* eccodes_accessor_signed_bits_h */
diff --git a/src/accessor/grib_accessor_class_simple_packing_error.cc b/src/accessor/grib_accessor_class_simple_packing_error.cc
new file mode 100644
index 000000000..41cfddacb
--- /dev/null
+++ b/src/accessor/grib_accessor_class_simple_packing_error.cc
@@ -0,0 +1,70 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_simple_packing_error.h"
+#include "grib_scaling.h"
+
+grib_accessor_class_simple_packing_error_t _grib_accessor_class_simple_packing_error{"simple_packing_error"};
+grib_accessor_class* grib_accessor_class_simple_packing_error = &_grib_accessor_class_simple_packing_error;
+
+
+void grib_accessor_class_simple_packing_error_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_simple_packing_error_t* self = (grib_accessor_simple_packing_error_t*)a;
+    int n = 0;
+    grib_handle* h = grib_handle_of_accessor(a);
+
+    self->bitsPerValue       = grib_arguments_get_name(h, c, n++);
+    self->binaryScaleFactor  = grib_arguments_get_name(h, c, n++);
+    self->decimalScaleFactor = grib_arguments_get_name(h, c, n++);
+    self->referenceValue     = grib_arguments_get_name(h, c, n++);
+    self->floatType          = grib_arguments_get_name(h, c, n++);
+
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->length = 0;
+}
+
+int grib_accessor_class_simple_packing_error_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_simple_packing_error_t* self = (grib_accessor_simple_packing_error_t*)a;
+
+    int ret                 = 0;
+    long binaryScaleFactor  = 0;
+    long bitsPerValue       = 0;
+    long decimalScaleFactor = 0;
+    double referenceValue   = 0;
+    grib_handle* h = grib_handle_of_accessor(a);
+
+    if ((ret = grib_get_long_internal(h, self->binaryScaleFactor, &binaryScaleFactor)) != GRIB_SUCCESS)
+        return ret;
+    if ((ret = grib_get_long_internal(h, self->bitsPerValue, &bitsPerValue)) != GRIB_SUCCESS)
+        return ret;
+
+    if ((ret = grib_get_long_internal(h, self->decimalScaleFactor, &decimalScaleFactor)) != GRIB_SUCCESS)
+        return ret;
+
+    if ((ret = grib_get_double_internal(h, self->referenceValue, &referenceValue)) != GRIB_SUCCESS)
+        return ret;
+
+    if (!strcmp(self->floatType, "ibm"))
+        *val = grib_ibmfloat_error(referenceValue);
+    else if (!strcmp(self->floatType, "ieee"))
+        *val = grib_ieeefloat_error(referenceValue);
+    else
+        Assert(1 == 0);
+
+    if (bitsPerValue != 0)
+        *val = (*val + codes_power<double>(binaryScaleFactor, 2)) * codes_power<double>(-decimalScaleFactor, 10) * 0.5;
+
+    if (ret == GRIB_SUCCESS)
+        *len = 1;
+
+    return ret;
+}
diff --git a/src/accessor/grib_accessor_class_simple_packing_error.h b/src/accessor/grib_accessor_class_simple_packing_error.h
new file mode 100644
index 000000000..6c90188c5
--- /dev/null
+++ b/src/accessor/grib_accessor_class_simple_packing_error.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_simple_packing_error_h
+#define eccodes_accessor_simple_packing_error_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_double.h"
+
+class grib_accessor_simple_packing_error_t : public grib_accessor_double_t
+{
+public:
+    /* Members defined in simple_packing_error */
+    const char*    binaryScaleFactor;
+    const char*    bitsPerValue;
+    const char*    decimalScaleFactor;
+    const char*    referenceValue;
+    const char*    floatType;
+};
+
+class grib_accessor_class_simple_packing_error_t : public grib_accessor_class_double_t
+{
+public:
+    grib_accessor_class_simple_packing_error_t(const char* name) : grib_accessor_class_double_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_simple_packing_error_t{}; }
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_simple_packing_error_h */
diff --git a/src/accessor/grib_accessor_class_size.cc b/src/accessor/grib_accessor_class_size.cc
new file mode 100644
index 000000000..7fbeac212
--- /dev/null
+++ b/src/accessor/grib_accessor_class_size.cc
@@ -0,0 +1,35 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_size.h"
+
+grib_accessor_class_size_t _grib_accessor_class_size{"size"};
+grib_accessor_class* grib_accessor_class_size = &_grib_accessor_class_size;
+
+
+void grib_accessor_class_size_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_size_t* self = (grib_accessor_size_t*)a;
+    self->accessor           = grib_arguments_get_name(grib_handle_of_accessor(a), c, 0);
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
+    a->length = 0;
+}
+
+int grib_accessor_class_size_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    int ret                  = 0;
+    size_t size              = 0;
+    grib_accessor_size_t* self = (grib_accessor_size_t*)a;
+    ret                      = grib_get_size(grib_handle_of_accessor(a), self->accessor, &size);
+    *val                     = (long)size;
+    *len                     = 1;
+    return ret;
+}
diff --git a/src/accessor/grib_accessor_class_size.h b/src/accessor/grib_accessor_class_size.h
new file mode 100644
index 000000000..dbf47f8bd
--- /dev/null
+++ b/src/accessor/grib_accessor_class_size.h
@@ -0,0 +1,33 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_size_h
+#define eccodes_accessor_size_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_size_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in size */
+    const char* accessor;
+};
+
+class grib_accessor_class_size_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_size_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_size_t{}; }
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_size_h */
diff --git a/src/accessor/grib_accessor_class_smart_table_column.cc b/src/accessor/grib_accessor_class_smart_table_column.cc
new file mode 100644
index 000000000..d8a5e267f
--- /dev/null
+++ b/src/accessor/grib_accessor_class_smart_table_column.cc
@@ -0,0 +1,177 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_smart_table_column.h"
+#include "grib_accessor_class_smart_table.h"
+
+grib_accessor_class_smart_table_column_t _grib_accessor_class_smart_table_column{"smart_table_column"};
+grib_accessor_class* grib_accessor_class_smart_table_column = &_grib_accessor_class_smart_table_column;
+
+
+
+void grib_accessor_class_smart_table_column_t::init(grib_accessor* a, const long len, grib_arguments* params){
+    int n = 0;
+    grib_accessor_smart_table_column_t* self = (grib_accessor_smart_table_column_t*)a;
+
+    self->smartTable = grib_arguments_get_name(grib_handle_of_accessor(a), params, n++);
+    self->index = grib_arguments_get_long(grib_handle_of_accessor(a), params, n++);
+
+    a->length = 0;
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+}
+
+void grib_accessor_class_smart_table_column_t::dump(grib_accessor* a, grib_dumper* dumper){
+    int type = get_native_type(a);
+
+    switch (type) {
+        case GRIB_TYPE_LONG:
+            grib_dump_long(dumper, a, NULL);
+            break;
+        case GRIB_TYPE_STRING:
+            grib_dump_string_array(dumper, a, NULL);
+            break;
+    }
+}
+
+int grib_accessor_class_smart_table_column_t::unpack_string_array(grib_accessor* a, char** buffer, size_t* len){
+    grib_accessor_smart_table_column_t* self   = (grib_accessor_smart_table_column_t*)a;
+    grib_accessor_smart_table_t* tableAccessor = NULL;
+    grib_smart_table* table = NULL;
+
+    size_t size = 1;
+    long* code;
+    int err = GRIB_SUCCESS;
+    char tmp[1024] = {0,};
+    int i = 0;
+
+    tableAccessor = (grib_accessor_smart_table_t*)grib_find_accessor(grib_handle_of_accessor(a), self->smartTable);
+    if (!tableAccessor) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "Unable to find accessor %s", self->smartTable);
+        return GRIB_NOT_FOUND;
+    }
+
+    err = grib_get_size_acc(grib_handle_of_accessor(a), (grib_accessor*)tableAccessor, &size);
+    if (err)
+        return err;
+    if (*len < size) {
+        return GRIB_BUFFER_TOO_SMALL;
+    }
+
+    code = (long*)grib_context_malloc_clear(a->context, sizeof(long) * size);
+    if (!code) {
+        grib_context_log(a->context, GRIB_LOG_FATAL, "%s: Memory allocation error: %zu bytes", a->name, size);
+        return GRIB_OUT_OF_MEMORY;
+    }
+
+    if ((err = ((grib_accessor*)tableAccessor)->unpack_long(code, &size)) != GRIB_SUCCESS)
+        return err;
+
+    table = tableAccessor->table;
+
+    for (i = 0; i < size; i++) {
+        if (table && (code[i] >= 0) &&
+            (code[i] < table->numberOfEntries) &&
+            table->entries[code[i]].column[self->index]) {
+            strcpy(tmp, table->entries[code[i]].column[self->index]);
+        }
+        else {
+            snprintf(tmp, sizeof(tmp), "%d", (int)code[i]);
+        }
+
+        buffer[i] = grib_context_strdup(a->context, tmp);
+    }
+    *len = size;
+    grib_context_free(a->context, code);
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_smart_table_column_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_smart_table_column_t* self   = (grib_accessor_smart_table_column_t*)a;
+    grib_accessor_smart_table_t* tableAccessor = NULL;
+    grib_smart_table* table = NULL;
+
+    size_t size = 1;
+    long* code;
+    int err = GRIB_SUCCESS;
+    int i   = 0;
+
+    for (i = 0; i < *len; i++)
+        val[i] = GRIB_MISSING_LONG;
+
+    tableAccessor = (grib_accessor_smart_table_t*)grib_find_accessor(grib_handle_of_accessor(a), self->smartTable);
+    if (!tableAccessor) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "Unable to find accessor %s", self->smartTable);
+        return GRIB_NOT_FOUND;
+    }
+
+    err = grib_get_size_acc(grib_handle_of_accessor(a), (grib_accessor*)tableAccessor, &size);
+    if (err)
+        return err;
+    if (*len < size) {
+        return GRIB_BUFFER_TOO_SMALL;
+    }
+
+    code = (long*)grib_context_malloc_clear(a->context, sizeof(long) * size);
+    if (!code) return GRIB_OUT_OF_MEMORY;
+
+    if ((err = ((grib_accessor*)tableAccessor)->unpack_long(code, &size)) != GRIB_SUCCESS) {
+        grib_context_free(a->context, code);
+        return err;
+    }
+
+    table = tableAccessor->table;
+
+    for (i = 0; i < size; i++) {
+        if (table && (code[i] >= 0) &&
+            (code[i] < table->numberOfEntries) &&
+            table->entries[code[i]].column[self->index]) {
+            val[i] = atol(table->entries[code[i]].column[self->index]);
+        }
+    }
+    *len = size;
+    grib_context_free(a->context, code);
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_smart_table_column_t::value_count(grib_accessor* a, long* count){
+    grib_accessor_smart_table_column_t* self = (grib_accessor_smart_table_column_t*)a;
+    size_t size = 0;
+    int err = 0;
+    *count = 0;
+
+    if (!self->smartTable)
+        return 0;
+
+    err = grib_get_size(grib_handle_of_accessor(a), self->smartTable, &size);
+    *count = size;
+    return err;
+}
+
+void grib_accessor_class_smart_table_column_t::destroy(grib_context* context, grib_accessor* a){
+    if (a->vvalue != NULL) {
+        grib_context_free(context, a->vvalue);
+        a->vvalue = NULL;
+    }
+}
+
+int grib_accessor_class_smart_table_column_t::get_native_type(grib_accessor* a){
+    int type = GRIB_TYPE_LONG;
+    /*printf("---------- %s flags=%ld GRIB_ACCESSOR_FLAG_STRING_TYPE=%d\n",
+         a->name,a->flags,GRIB_ACCESSOR_FLAG_STRING_TYPE);*/
+    if (a->flags & GRIB_ACCESSOR_FLAG_STRING_TYPE)
+        type = GRIB_TYPE_STRING;
+    return type;
+}
diff --git a/src/accessor/grib_accessor_class_smart_table_column.h b/src/accessor/grib_accessor_class_smart_table_column.h
new file mode 100644
index 000000000..0c24454bc
--- /dev/null
+++ b/src/accessor/grib_accessor_class_smart_table_column.h
@@ -0,0 +1,39 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_smart_table_column_h
+#define eccodes_accessor_smart_table_column_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_smart_table_column_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in smart_table_column */
+    const char* smartTable;
+    int index;
+};
+
+class grib_accessor_class_smart_table_column_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_smart_table_column_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_smart_table_column_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string_array(grib_accessor*, char**, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void destroy(grib_context*, grib_accessor*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_smart_table_column_h */
diff --git a/src/accessor/grib_accessor_class_spd.cc b/src/accessor/grib_accessor_class_spd.cc
new file mode 100644
index 000000000..7e1083377
--- /dev/null
+++ b/src/accessor/grib_accessor_class_spd.cc
@@ -0,0 +1,158 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_spd.h"
+
+grib_accessor_class_spd_t _grib_accessor_class_spd{"spd"};
+grib_accessor_class* grib_accessor_class_spd = &_grib_accessor_class_spd;
+
+
+long grib_accessor_class_spd_t::byte_count(grib_accessor* a){
+    return a->length;
+}
+
+static long compute_byte_count(grib_accessor* a){
+    grib_accessor_spd_t* self = (grib_accessor_spd_t*)a;
+    long numberOfBits;
+    long numberOfElements;
+    int ret = 0;
+
+    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfBits, &numberOfBits);
+    if (ret) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "%s unable to get %s to compute size", a->name, self->numberOfBits);
+        return 0;
+    }
+
+    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfElements, &numberOfElements);
+    if (ret) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "%s unable to get %s to compute size", a->name, self->numberOfElements);
+        return 0;
+    }
+    numberOfElements++;
+
+    return (numberOfBits * numberOfElements + 7) / 8;
+}
+
+void grib_accessor_class_spd_t::init(grib_accessor* a, const long len, grib_arguments* args){
+    grib_accessor_spd_t* self = (grib_accessor_spd_t*)a;
+    int n                   = 0;
+    self->numberOfBits      = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
+    self->numberOfElements  = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
+    a->length               = compute_byte_count(a);
+}
+
+int grib_accessor_class_spd_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_spd_t* self = (grib_accessor_spd_t*)a;
+    int i;
+    int ret           = 0;
+    long pos          = a->offset * 8;
+    long rlen         = 0;
+    long numberOfBits = 0;
+
+    ret = value_count(a, &rlen);
+    if (ret)
+        return ret;
+
+    if (*len < rlen) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "Wrong size (%zu) for %s, it contains %ld values", *len, a->name, rlen);
+        *len = rlen;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfBits, &numberOfBits);
+    if (ret)
+        return ret;
+    if (numberOfBits > 64) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,"Invalid number of bits: %ld",numberOfBits);
+        return GRIB_DECODING_ERROR;
+    }
+
+    for (i = 0; i < rlen - 1; i++)
+        val[i] = grib_decode_unsigned_long(grib_handle_of_accessor(a)->buffer->data, &pos, numberOfBits);
+
+    val[rlen - 1] = grib_decode_signed_longb(grib_handle_of_accessor(a)->buffer->data, &pos, numberOfBits);
+
+    *len = rlen;
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_spd_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_spd_t* self = (grib_accessor_spd_t*)a;
+    int ret                 = 0;
+    long off                = 0;
+    long numberOfBits       = 0;
+    size_t buflen           = 0;
+    unsigned char* buf      = NULL;
+    unsigned long i         = 0;
+    long rlen               = 0;
+
+    ret = value_count(a, &rlen);
+    if (ret)
+        return ret;
+
+    if (*len != rlen) {
+        ret = grib_set_long(grib_handle_of_accessor(a), self->numberOfElements, (*len) - 1);
+        if (ret) return ret;
+    }
+
+    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfBits, &numberOfBits);
+    if (ret)
+        return ret;
+
+    buflen = compute_byte_count(a);
+    buf    = (unsigned char*)grib_context_malloc_clear(a->context, buflen);
+
+    for (i = 0; i < rlen - 1; i++) {
+        grib_encode_unsigned_longb(buf, val[i], &off, numberOfBits);
+    }
+
+    grib_encode_signed_longb(buf, val[rlen - 1], &off, numberOfBits);
+
+    grib_buffer_replace(a, buf, buflen, 1, 1);
+
+    grib_context_free(a->context, buf);
+
+    *len = rlen;
+    return ret;
+}
+
+int grib_accessor_class_spd_t::value_count(grib_accessor* a, long* numberOfElements){
+    grib_accessor_spd_t* self = (grib_accessor_spd_t*)a;
+    int ret;
+    *numberOfElements = 0;
+
+    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfElements, numberOfElements);
+    if (ret) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "%s unable to get %s to compute size", a->name, self->numberOfElements);
+        return ret;
+    }
+    (*numberOfElements)++;
+
+    return ret;
+}
+
+long grib_accessor_class_spd_t::byte_offset(grib_accessor* a){
+    return a->offset;
+}
+
+void grib_accessor_class_spd_t::update_size(grib_accessor* a, size_t s){
+    a->length = s;
+}
+
+long grib_accessor_class_spd_t::next_offset(grib_accessor* a){
+    return byte_offset(a) + a->length;
+}
diff --git a/src/accessor/grib_accessor_class_spd.h b/src/accessor/grib_accessor_class_spd.h
new file mode 100644
index 000000000..c35e5c742
--- /dev/null
+++ b/src/accessor/grib_accessor_class_spd.h
@@ -0,0 +1,40 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_spd_h
+#define eccodes_accessor_spd_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_spd_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in spd */
+    const char* numberOfBits;
+    const char* numberOfElements;
+};
+
+class grib_accessor_class_spd_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_spd_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_spd_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    long byte_count(grib_accessor*) override;
+    long byte_offset(grib_accessor*) override;
+    long next_offset(grib_accessor*) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    void update_size(grib_accessor*, size_t) override;
+};
+#endif /* eccodes_accessor_spd_h */
diff --git a/src/accessor/grib_accessor_class_spectral_truncation.cc b/src/accessor/grib_accessor_class_spectral_truncation.cc
new file mode 100644
index 000000000..c10a32d6e
--- /dev/null
+++ b/src/accessor/grib_accessor_class_spectral_truncation.cc
@@ -0,0 +1,81 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_spectral_truncation.h"
+
+grib_accessor_class_spectral_truncation_t _grib_accessor_class_spectral_truncation{"spectral_truncation"};
+grib_accessor_class* grib_accessor_class_spectral_truncation = &_grib_accessor_class_spectral_truncation;
+
+
+void grib_accessor_class_spectral_truncation_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_spectral_truncation_t* self = (grib_accessor_spectral_truncation_t*)a;
+    int n                                   = 0;
+
+    self->J = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->K = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->M = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->T = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+}
+
+int grib_accessor_class_spectral_truncation_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_spectral_truncation_t* self = (grib_accessor_spectral_truncation_t*)a;
+    int ret                                 = 0;
+
+    long J, K, M, T, Tc;
+
+    if (*len < 1)
+        return GRIB_ARRAY_TOO_SMALL;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->J, &J)) != GRIB_SUCCESS)
+        return ret;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->K, &K)) != GRIB_SUCCESS)
+        return ret;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->M, &M)) != GRIB_SUCCESS)
+        return ret;
+
+    Tc = -1;
+    if (J == K && K == M) {
+        /* Triangular truncation */
+        Tc = (M + 1) * (M + 2);
+    }
+    if (K == J + M) {
+        /* Rhomboidal truncation */
+        Tc = 2 * J * M;
+    }
+    if (J == K && K > M) {
+        /* Trapezoidal truncation */
+        Tc = M * (2 * J - M);
+    }
+    *val = Tc;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->T, &T)) != GRIB_SUCCESS) {
+        if (Tc == -1)
+            grib_context_log(a->context, GRIB_LOG_ERROR,
+                             "%s. Spectral Truncation Type Unknown: %s=%ld %s=%ld %s=%ld",
+                             a->name, self->J, J, self->K, K, self->M, M);
+        Tc = 0;
+        grib_set_long(grib_handle_of_accessor(a), self->T, Tc);
+    }
+    else {
+        if (Tc != -1 && Tc != T)
+            grib_set_long(grib_handle_of_accessor(a), self->T, Tc);
+    }
+
+    if (ret == GRIB_SUCCESS)
+        *len = 1;
+
+    return ret;
+}
diff --git a/src/accessor/grib_accessor_class_spectral_truncation.h b/src/accessor/grib_accessor_class_spectral_truncation.h
new file mode 100644
index 000000000..0ab43b1fd
--- /dev/null
+++ b/src/accessor/grib_accessor_class_spectral_truncation.h
@@ -0,0 +1,36 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_spectral_truncation_h
+#define eccodes_accessor_spectral_truncation_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_spectral_truncation_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in spectral_truncation */
+    const char* J;
+    const char* K;
+    const char* M;
+    const char* T;
+};
+
+class grib_accessor_class_spectral_truncation_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_spectral_truncation_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_spectral_truncation_t{}; }
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_spectral_truncation_h */
diff --git a/src/accessor/todo/grib_accessor_class_sprintf.cc b/src/accessor/grib_accessor_class_sprintf.cc
similarity index 54%
rename from src/accessor/todo/grib_accessor_class_sprintf.cc
rename to src/accessor/grib_accessor_class_sprintf.cc
index 106ce1e4d..8df2bb732 100644
--- a/src/accessor/todo/grib_accessor_class_sprintf.cc
+++ b/src/accessor/grib_accessor_class_sprintf.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,108 +10,20 @@
  */
 
 #include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_ascii
-   IMPLEMENTS = unpack_string;value_count
-   IMPLEMENTS = init;string_length
-   MEMBERS= grib_arguments* args
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static size_t string_length(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_sprintf
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in ascii */
-    /* Members defined in sprintf */
-    grib_arguments* args;
-} grib_accessor_sprintf;
-
-extern grib_accessor_class* grib_accessor_class_ascii;
-
-static grib_accessor_class _grib_accessor_class_sprintf = {
-    &grib_accessor_class_ascii,                      /* super */
-    "sprintf",                      /* name */
-    sizeof(grib_accessor_sprintf),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    &string_length,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_sprintf.h"
 
+grib_accessor_class_sprintf_t _grib_accessor_class_sprintf{"sprintf"};
 grib_accessor_class* grib_accessor_class_sprintf = &_grib_accessor_class_sprintf;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_sprintf* self = (grib_accessor_sprintf*)a;
+void grib_accessor_class_sprintf_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_sprintf_t* self = (grib_accessor_sprintf_t*)a;
     self->args                  = c;
     a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
 }
 
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    grib_accessor_sprintf* self = (grib_accessor_sprintf*)a;
+int grib_accessor_class_sprintf_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    grib_accessor_sprintf_t* self = (grib_accessor_sprintf_t*)a;
     char result[1024];
     char tempBuffer[2048];
     char sres[1024];
@@ -148,8 +61,7 @@ static int unpack_string(grib_accessor* a, char* val, size_t* len)
                     if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), tempname, &ires)) != GRIB_SUCCESS)
                         return ret;
                     /* Bug GRIB-56: Check to see if the key is missing */
-                    is_missing = grib_is_missing(grib_handle_of_accessor(a), tempname, &ret);
-                    if (ret != GRIB_SUCCESS)
+                    is_missing = grib_is_missing(grib_handle_of_accessor(a), tempname, &ret);                    if (ret != GRIB_SUCCESS)
                         return ret;
                     if (is_missing) {
                         snprintf(tempBuffer, sizeof(tempBuffer), "%sMISSING", result);
@@ -205,13 +117,11 @@ static int unpack_string(grib_accessor* a, char* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int value_count(grib_accessor* a, long* count)
-{
+int grib_accessor_class_sprintf_t::value_count(grib_accessor* a, long* count){
     *count = 1;
     return 0;
 }
 
-static size_t string_length(grib_accessor* a)
-{
+size_t grib_accessor_class_sprintf_t::string_length(grib_accessor* a){
     return 1024;
 }
diff --git a/src/accessor/grib_accessor_class_sprintf.h b/src/accessor/grib_accessor_class_sprintf.h
new file mode 100644
index 000000000..9bfb1c83e
--- /dev/null
+++ b/src/accessor/grib_accessor_class_sprintf.h
@@ -0,0 +1,35 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_sprintf_h
+#define eccodes_accessor_sprintf_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_ascii.h"
+
+class grib_accessor_sprintf_t : public grib_accessor_ascii_t
+{
+public:
+    /* Members defined in sprintf */
+    grib_arguments* args;
+};
+
+class grib_accessor_class_sprintf_t : public grib_accessor_class_ascii_t
+{
+public:
+    grib_accessor_class_sprintf_t(const char* name) : grib_accessor_class_ascii_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_sprintf_t{}; }
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    size_t string_length(grib_accessor*) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_sprintf_h */
diff --git a/src/accessor/todo/grib_accessor_class_statistics.cc b/src/accessor/grib_accessor_class_statistics.cc
similarity index 55%
rename from src/accessor/todo/grib_accessor_class_statistics.cc
rename to src/accessor/grib_accessor_class_statistics.cc
index 915701a3a..9a4eeee20 100644
--- a/src/accessor/todo/grib_accessor_class_statistics.cc
+++ b/src/accessor/grib_accessor_class_statistics.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -8,116 +9,15 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-/**************************************
- *  Enrico Fucile
- **************************************/
-
-
 #include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_abstract_vector
-   IMPLEMENTS = unpack_double; destroy
-   IMPLEMENTS = unpack_string
-   IMPLEMENTS = value_count;compare
-   IMPLEMENTS = init
-   MEMBERS = const char* values
-   MEMBERS = const char* missing_value
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void destroy(grib_context*, grib_accessor*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static int compare(grib_accessor*, grib_accessor*);
-
-typedef struct grib_accessor_statistics
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in abstract_vector */
-    double* v;
-    int number_of_elements;
-    /* Members defined in statistics */
-    const char* values;
-    const char* missing_value;
-} grib_accessor_statistics;
-
-extern grib_accessor_class* grib_accessor_class_abstract_vector;
-
-static grib_accessor_class _grib_accessor_class_statistics = {
-    &grib_accessor_class_abstract_vector,                      /* super */
-    "statistics",                      /* name */
-    sizeof(grib_accessor_statistics),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    &destroy,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    &compare,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
+#include "grib_accessor_class_statistics.h"
 
+grib_accessor_class_statistics_t _grib_accessor_class_statistics{"statistics"};
 grib_accessor_class* grib_accessor_class_statistics = &_grib_accessor_class_statistics;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_statistics* self = (grib_accessor_statistics*)a;
+void grib_accessor_class_statistics_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_statistics_t* self = (grib_accessor_statistics_t*)a;
     int n                          = 0;
 
     self->missing_value = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
@@ -134,9 +34,8 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
     a->dirty  = 1;
 }
 
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_statistics* self = (grib_accessor_statistics*)a;
+int grib_accessor_class_statistics_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_statistics_t* self = (grib_accessor_statistics_t*)a;
     int ret = 0;
     double* values = NULL;
     size_t i = 0, size = 0, real_size = 0;
@@ -157,7 +56,7 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
         return ret;
 
     grib_context_log(a->context, GRIB_LOG_DEBUG,
-                     "grib_accessor_statistics: computing statistics for %d values", size);
+                     "grib_accessor_statistics_t: computing statistics for %d values", size);
 
     if ((ret = grib_get_double(h, self->missing_value, &missing)) != GRIB_SUCCESS)
         return ret;
@@ -267,21 +166,18 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     return ret;
 }
 
-static int value_count(grib_accessor* a, long* count)
-{
-    grib_accessor_statistics* self = (grib_accessor_statistics*)a;
+int grib_accessor_class_statistics_t::value_count(grib_accessor* a, long* count){
+    grib_accessor_statistics_t* self = (grib_accessor_statistics_t*)a;
     *count                         = self->number_of_elements;
     return 0;
 }
 
-static void destroy(grib_context* c, grib_accessor* a)
-{
-    grib_accessor_statistics* self = (grib_accessor_statistics*)a;
+void grib_accessor_class_statistics_t::destroy(grib_context* c, grib_accessor* a){
+    grib_accessor_statistics_t* self = (grib_accessor_statistics_t*)a;
     grib_context_free(c, self->v);
 }
 
-static int compare(grib_accessor* a, grib_accessor* b)
-{
+int grib_accessor_class_statistics_t::compare(grib_accessor* a, grib_accessor* b){
     int retval   = GRIB_SUCCESS;
     double* aval = 0;
     double* bval = 0;
@@ -291,13 +187,11 @@ static int compare(grib_accessor* a, grib_accessor* b)
     int err     = 0;
     long count  = 0;
 
-    err = grib_value_count(a, &count);
-    if (err)
+    err = a->value_count(&count);    if (err)
         return err;
     alen = count;
 
-    err = grib_value_count(b, &count);
-    if (err)
+    err = b->value_count(&count);    if (err)
         return err;
     blen = count;
 
@@ -310,9 +204,7 @@ static int compare(grib_accessor* a, grib_accessor* b)
     b->dirty = 1;
     a->dirty = 1;
 
-    grib_unpack_double(a, aval, &alen);
-    grib_unpack_double(b, bval, &blen);
-
+    a->unpack_double(aval, &alen);    b->unpack_double(bval, &blen);
     retval = GRIB_SUCCESS;
     for (size_t i=0; i<alen && retval == GRIB_SUCCESS; ++i) {
         if (aval[i] != bval[i]) retval = GRIB_DOUBLE_VALUE_MISMATCH;
@@ -324,7 +216,6 @@ static int compare(grib_accessor* a, grib_accessor* b)
     return retval;
 }
 
-static int unpack_string(grib_accessor* a, char* v, size_t* len)
-{
+int grib_accessor_class_statistics_t::unpack_string(grib_accessor* a, char* v, size_t* len){
     return GRIB_NOT_IMPLEMENTED;
 }
diff --git a/src/accessor/grib_accessor_class_statistics.h b/src/accessor/grib_accessor_class_statistics.h
new file mode 100644
index 000000000..4eea0b546
--- /dev/null
+++ b/src/accessor/grib_accessor_class_statistics.h
@@ -0,0 +1,38 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_statistics_h
+#define eccodes_accessor_statistics_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_abstract_vector.h"
+
+class grib_accessor_statistics_t : public grib_accessor_abstract_vector_t
+{
+public:
+    /* Members defined in statistics */
+    const char* values;
+    const char* missing_value;
+};
+
+class grib_accessor_class_statistics_t : public grib_accessor_class_abstract_vector_t
+{
+public:
+    grib_accessor_class_statistics_t(const char* name) : grib_accessor_class_abstract_vector_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_statistics_t{}; }
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void destroy(grib_context*, grib_accessor*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    int compare(grib_accessor*, grib_accessor*) override;
+};
+#endif /* eccodes_accessor_statistics_h */
diff --git a/src/accessor/grib_accessor_class_statistics_spectral.cc b/src/accessor/grib_accessor_class_statistics_spectral.cc
new file mode 100644
index 000000000..f8596b84b
--- /dev/null
+++ b/src/accessor/grib_accessor_class_statistics_spectral.cc
@@ -0,0 +1,165 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_statistics_spectral.h"
+
+grib_accessor_class_statistics_spectral_t _grib_accessor_class_statistics_spectral{"statistics_spectral"};
+grib_accessor_class* grib_accessor_class_statistics_spectral = &_grib_accessor_class_statistics_spectral;
+
+
+void grib_accessor_class_statistics_spectral_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_statistics_spectral_t* self = (grib_accessor_statistics_spectral_t*)a;
+    int n                                   = 0;
+
+    self->values = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->J      = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->K      = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->M      = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->JS     = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
+
+    self->number_of_elements = 4;
+    self->v                  = (double*)grib_context_malloc(a->context,
+                                           sizeof(double) * self->number_of_elements);
+
+    a->length = 0;
+    a->dirty  = 1;
+}
+
+int grib_accessor_class_statistics_spectral_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_statistics_spectral_t* self = (grib_accessor_statistics_spectral_t*)a;
+    int ret = 0, i = 0;
+    double* values;
+    size_t size = 0;
+    long J, K, M, N;
+    double avg, enorm, sd;
+    grib_context* c = a->context;
+    grib_handle* h  = grib_handle_of_accessor(a);
+
+    if (!a->dirty)
+        return GRIB_SUCCESS;
+
+    if (*len != self->number_of_elements)
+        return GRIB_ARRAY_TOO_SMALL;
+
+    if ((ret = grib_get_size(h, self->values, &size)) != GRIB_SUCCESS)
+        return ret;
+
+    if ((ret = grib_get_long(grib_handle_of_accessor(a), self->J, &J)) != GRIB_SUCCESS)
+        return ret;
+
+    if ((ret = grib_get_long(grib_handle_of_accessor(a), self->K, &K)) != GRIB_SUCCESS)
+        return ret;
+
+    if ((ret = grib_get_long(grib_handle_of_accessor(a), self->M, &M)) != GRIB_SUCCESS)
+        return ret;
+
+    if (J != M || M != K)
+        return GRIB_NOT_IMPLEMENTED;
+
+    N = (M + 1) * (M + 2) / 2;
+
+    if (2 * N != size) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "wrong number of components for spherical harmonics %ld != %ld", 2 * N, size);
+        return GRIB_WRONG_ARRAY_SIZE;
+    }
+
+    values = (double*)grib_context_malloc(c, size * sizeof(double));
+    if (!values)
+        return GRIB_OUT_OF_MEMORY;
+
+    if ((ret = grib_get_double_array_internal(h, self->values, values, &size)) != GRIB_SUCCESS) {
+        grib_context_free(c, values);
+        return ret;
+    }
+
+    avg   = values[0];
+    sd    = 0;
+
+    for (i = 2; i < 2 * J; i += 2)
+        sd += values[i] * values[i];
+
+    for (i = 2 * J; i < size; i += 2)
+        sd += 2 * values[i] * values[i] + 2 * values[i + 1] * values[i + 1];
+
+    enorm = sd + avg * avg;
+
+    sd    = sqrt(sd);
+    enorm = sqrt(enorm);
+
+    a->dirty = 0;
+
+    grib_context_free(c, values);
+
+    self->v[0] = avg;
+    self->v[1] = enorm;
+    self->v[2] = sd;
+    self->v[3] = sd == 0 ? 1 : 0;
+
+    for (i = 0; i < self->number_of_elements; i++)
+        val[i] = self->v[i];
+
+    return ret;
+}
+
+int grib_accessor_class_statistics_spectral_t::value_count(grib_accessor* a, long* count){
+    grib_accessor_statistics_spectral_t* self = (grib_accessor_statistics_spectral_t*)a;
+    *count                                  = self->number_of_elements;
+    return 0;
+}
+
+void grib_accessor_class_statistics_spectral_t::destroy(grib_context* c, grib_accessor* a){
+    grib_accessor_statistics_spectral_t* self = (grib_accessor_statistics_spectral_t*)a;
+    grib_context_free(c, self->v);
+}
+
+int grib_accessor_class_statistics_spectral_t::compare(grib_accessor* a, grib_accessor* b){
+    int retval   = GRIB_SUCCESS;
+    double* aval = 0;
+    double* bval = 0;
+
+    size_t alen = 0;
+    size_t blen = 0;
+    int err     = 0;
+    long count  = 0;
+
+    err = a->value_count(&count);    if (err)
+        return err;
+    alen = count;
+
+    err = b->value_count(&count);    if (err)
+        return err;
+    blen = count;
+
+    if (alen != blen)
+        return GRIB_COUNT_MISMATCH;
+
+    aval = (double*)grib_context_malloc(a->context, alen * sizeof(double));
+    bval = (double*)grib_context_malloc(b->context, blen * sizeof(double));
+
+    b->dirty = 1;
+    a->dirty = 1;
+
+    a->unpack_double(aval, &alen);    b->unpack_double(bval, &blen);
+    retval = GRIB_SUCCESS;
+    for (size_t i=0; i<alen && retval == GRIB_SUCCESS; ++i) {
+        if (aval[i] != bval[i]) retval = GRIB_DOUBLE_VALUE_MISMATCH;
+    }
+
+    grib_context_free(a->context, aval);
+    grib_context_free(b->context, bval);
+
+    return retval;
+}
diff --git a/src/accessor/grib_accessor_class_statistics_spectral.h b/src/accessor/grib_accessor_class_statistics_spectral.h
new file mode 100644
index 000000000..8075ddf31
--- /dev/null
+++ b/src/accessor/grib_accessor_class_statistics_spectral.h
@@ -0,0 +1,40 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_statistics_spectral_h
+#define eccodes_accessor_statistics_spectral_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_abstract_vector.h"
+
+class grib_accessor_statistics_spectral_t : public grib_accessor_abstract_vector_t
+{
+public:
+    /* Members defined in statistics_spectral */
+    const char* values;
+    const char* J;
+    const char* K;
+    const char* M;
+    const char* JS;
+};
+
+class grib_accessor_class_statistics_spectral_t : public grib_accessor_class_abstract_vector_t
+{
+public:
+    grib_accessor_class_statistics_spectral_t(const char* name) : grib_accessor_class_abstract_vector_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_statistics_spectral_t{}; }
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void destroy(grib_context*, grib_accessor*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    int compare(grib_accessor*, grib_accessor*) override;
+};
+#endif /* eccodes_accessor_statistics_spectral_h */
diff --git a/src/accessor/grib_accessor_class_step_human_readable.cc b/src/accessor/grib_accessor_class_step_human_readable.cc
new file mode 100644
index 000000000..153468565
--- /dev/null
+++ b/src/accessor/grib_accessor_class_step_human_readable.cc
@@ -0,0 +1,79 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_step_human_readable.h"
+
+grib_accessor_class_step_human_readable_t _grib_accessor_class_step_human_readable{"step_human_readable"};
+grib_accessor_class* grib_accessor_class_step_human_readable = &_grib_accessor_class_step_human_readable;
+
+
+void grib_accessor_class_step_human_readable_t::init(grib_accessor* a, const long len, grib_arguments* params){
+    grib_accessor_step_human_readable_t* self = (grib_accessor_step_human_readable_t*)a;
+    int n                              = 0;
+    grib_handle* h = grib_handle_of_accessor(a);
+
+    self->stepUnits                    = grib_arguments_get_name(h, params, n++);
+    self->step                         = grib_arguments_get_name(h, params, n++);
+    a->length                          = 0;
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+}
+
+int grib_accessor_class_step_human_readable_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_STRING;
+}
+
+int get_step_human_readable(grib_handle* h, char* result, size_t* length){
+    int err = 0;
+    size_t slen = 2;
+    long step, hour, minute, second;
+
+    /* Change units to seconds (highest resolution)
+     * before computing the step value
+     */
+    if ((err = grib_set_string(h, "stepUnits", "s", &slen)) != GRIB_SUCCESS)
+        return err;
+    if ((err = grib_get_long(h, "step", &step)) != GRIB_SUCCESS) 
+        return err;
+
+    hour = step/3600;
+    minute = step/60 % 60;
+    second = step % 60;
+    /* sprintf(result, "%ld:%ld:%ld", hour, minute, second); */
+
+    if (second) {
+        snprintf(result, 1024, "%ldh %ldm %lds", hour, minute, second);
+    } else {
+        if (minute) snprintf(result, 1024, "%ldh %ldm", hour, minute);
+        else snprintf(result, 1024, "%ldh", hour);
+    }
+
+    *length = strlen(result);
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_step_human_readable_t::unpack_string(grib_accessor* a, char* buffer, size_t* len){
+    grib_accessor_step_human_readable_t* self = (grib_accessor_step_human_readable_t*)a;
+    grib_handle* h = grib_handle_of_accessor(a);
+    long stepUnits;
+    int err = 0;
+
+    /* Save the current value of stepUnits */
+    err = grib_get_long_internal(h, self->stepUnits, &stepUnits);
+    if (err) return err;
+
+    /* This will change stepUnits to seconds for its calculation */
+    err = get_step_human_readable(h, buffer, len);
+
+    /* Restore stepUnits */
+    grib_set_long(h, self->stepUnits, stepUnits);
+    return err;
+}
diff --git a/src/accessor/grib_accessor_class_step_human_readable.h b/src/accessor/grib_accessor_class_step_human_readable.h
new file mode 100644
index 000000000..793ecb618
--- /dev/null
+++ b/src/accessor/grib_accessor_class_step_human_readable.h
@@ -0,0 +1,35 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_step_human_readable_h
+#define eccodes_accessor_step_human_readable_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_step_human_readable_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in step_human_readable */
+    const char* stepUnits;
+    const char* step;
+};
+
+class grib_accessor_class_step_human_readable_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_step_human_readable_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_step_human_readable_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_step_human_readable_h */
diff --git a/src/accessor/todo/grib_accessor_class_step_in_units.cc b/src/accessor/grib_accessor_class_step_in_units.cc
similarity index 63%
rename from src/accessor/todo/grib_accessor_class_step_in_units.cc
rename to src/accessor/grib_accessor_class_step_in_units.cc
index a25c85aec..4d7cb6cf9 100644
--- a/src/accessor/todo/grib_accessor_class_step_in_units.cc
+++ b/src/accessor/grib_accessor_class_step_in_units.cc
@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -9,120 +10,17 @@
  */
 
 #include "grib_api_internal.h"
+#include "grib_accessor_class_step_in_units.h"
 #include "step.h"
 #include "step_utilities.h"
 #include <stdexcept>
-/*
-  This is used by make_class.pl
-
-  START_CLASS_DEF
-  CLASS      = accessor
-  SUPER      = grib_accessor_class_long
-  IMPLEMENTS = unpack_long;pack_long
-  IMPLEMENTS = unpack_double
-  IMPLEMENTS = unpack_string;pack_string
-  IMPLEMENTS = init;dump
-  IMPLEMENTS = get_native_type
-  MEMBERS = const char* forecast_time_value
-  MEMBERS = const char* forecast_time_unit
-  MEMBERS = const char* step_units
-  MEMBERS = const char* time_range_unit 
-  MEMBERS = const char* time_range_value
-
-  END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int pack_string(grib_accessor*, const char*, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_step_in_units
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in step_in_units */
-    const char* forecast_time_value;
-    const char* forecast_time_unit;
-    const char* step_units;
-    const char* time_range_unit;
-    const char* time_range_value;
-} grib_accessor_step_in_units;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_step_in_units = {
-    &grib_accessor_class_long,                      /* super */
-    "step_in_units",                      /* name */
-    sizeof(grib_accessor_step_in_units),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    &pack_string,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
 
+grib_accessor_class_step_in_units_t _grib_accessor_class_step_in_units{"step_in_units"};
 grib_accessor_class* grib_accessor_class_step_in_units = &_grib_accessor_class_step_in_units;
 
-/* END_CLASS_IMP */
 
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_step_in_units* self = (grib_accessor_step_in_units*)a;
+void grib_accessor_class_step_in_units_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_step_in_units_t* self = (grib_accessor_step_in_units_t*)a;
     grib_handle* hand = grib_handle_of_accessor(a);
     int n = 0;
 
@@ -133,14 +31,12 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
     self->time_range_value    = grib_arguments_get_name(hand, c, n++);
 }
 
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
+void grib_accessor_class_step_in_units_t::dump(grib_accessor* a, grib_dumper* dumper){
     grib_dump_double(dumper, a, NULL);
 }
 
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    const grib_accessor_step_in_units* self = (grib_accessor_step_in_units*)a;
+int grib_accessor_class_step_in_units_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    const grib_accessor_step_in_units_t* self = (grib_accessor_step_in_units_t*)a;
     int err = 0;
     long forecast_time_value, forecast_time_unit, step_units;
     grib_handle* h = grib_handle_of_accessor(a);
@@ -169,9 +65,8 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int unpack_double(grib_accessor* a, double * val, size_t* len)
-{
-    const grib_accessor_step_in_units* self = (grib_accessor_step_in_units*)a;
+int grib_accessor_class_step_in_units_t::unpack_double(grib_accessor* a, double * val, size_t* len){
+    const grib_accessor_step_in_units_t* self = (grib_accessor_step_in_units_t*)a;
     int err = 0;
     long forecast_time_value, forecast_time_unit, step_units;
     grib_handle* h = grib_handle_of_accessor(a);
@@ -199,9 +94,8 @@ static int unpack_double(grib_accessor* a, double * val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int pack_long_new_(grib_accessor* a, const long start_step_value, const long start_step_unit, const long force_step_units)
-{
-    const grib_accessor_step_in_units* self = (grib_accessor_step_in_units*)a;
+int pack_long_new_(grib_accessor* a, const long start_step_value, const long start_step_unit, const long force_step_units){
+    const grib_accessor_step_in_units_t* self = (grib_accessor_step_in_units_t*)a;
     grib_handle* h = grib_handle_of_accessor(a);
     int err = 0;
     long forecast_time_unit;
@@ -211,7 +105,7 @@ static int pack_long_new_(grib_accessor* a, const long start_step_value, const l
 
     if ((err = grib_get_long_internal(h, self->forecast_time_unit, &forecast_time_unit)) != GRIB_SUCCESS)
         return err;
-    if ((err = unpack_long(a, &start_step_value_old, &len)) != GRIB_SUCCESS)
+    if ((err = a->unpack_long(&start_step_value_old, &len)) != GRIB_SUCCESS)
         return err;
     if ((err = grib_get_long_internal(h, "startStepUnit", &start_step_unit_old)) != GRIB_SUCCESS)
         return err;
@@ -249,8 +143,7 @@ static int pack_long_new_(grib_accessor* a, const long start_step_value, const l
     return GRIB_SUCCESS;
 }
 
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
+int grib_accessor_class_step_in_units_t::pack_long(grib_accessor* a, const long* val, size_t* len){
     grib_handle* h = grib_handle_of_accessor(a);
     int ret = GRIB_SUCCESS;
 
@@ -281,8 +174,7 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
     return ret;
 }
 
-static int pack_string(grib_accessor* a, const char* val, size_t* len)
-{
+int grib_accessor_class_step_in_units_t::pack_string(grib_accessor* a, const char* val, size_t* len){
     grib_handle* h = grib_handle_of_accessor(a);
     //long force_step_units = eccodes::Unit(eccodes::Unit::Value::MISSING).value<long>();
     int ret = GRIB_SUCCESS;
@@ -303,9 +195,8 @@ static int pack_string(grib_accessor* a, const char* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int unpack_string(grib_accessor* a, char* val, size_t* len) 
-{
-    const grib_accessor_step_in_units* self = (grib_accessor_step_in_units*)a;
+int grib_accessor_class_step_in_units_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    const grib_accessor_step_in_units_t* self = (grib_accessor_step_in_units_t*)a;
     grib_handle* h = grib_handle_of_accessor(a);
     int ret = GRIB_SUCCESS;
     long start_step_value = 0;
@@ -347,8 +238,7 @@ static int unpack_string(grib_accessor* a, char* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-static int get_native_type(grib_accessor* a)
-{
+int grib_accessor_class_step_in_units_t::get_native_type(grib_accessor* a){
     grib_handle* h = grib_handle_of_accessor(a);
     const int show_units_for_hours = a->context->grib_hourly_steps_with_units;
 
diff --git a/src/accessor/grib_accessor_class_step_in_units.h b/src/accessor/grib_accessor_class_step_in_units.h
new file mode 100644
index 000000000..ba088db79
--- /dev/null
+++ b/src/accessor/grib_accessor_class_step_in_units.h
@@ -0,0 +1,43 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_step_in_units_h
+#define eccodes_accessor_step_in_units_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_step_in_units_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in step_in_units */
+    const char* forecast_time_value;
+    const char* forecast_time_unit;
+    const char* step_units;
+    const char* time_range_unit;
+    const char* time_range_value;
+};
+
+class grib_accessor_class_step_in_units_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_step_in_units_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_step_in_units_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int pack_string(grib_accessor*, const char*, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_step_in_units_h */
diff --git a/src/accessor/grib_accessor_class_sum.cc b/src/accessor/grib_accessor_class_sum.cc
new file mode 100644
index 000000000..5129ade27
--- /dev/null
+++ b/src/accessor/grib_accessor_class_sum.cc
@@ -0,0 +1,107 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_sum.h"
+
+grib_accessor_class_sum_t _grib_accessor_class_sum{"sum"};
+grib_accessor_class* grib_accessor_class_sum = &_grib_accessor_class_sum;
+
+
+void grib_accessor_class_sum_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_sum_t* self = (grib_accessor_sum_t*)a;
+    int n                   = 0;
+    self->values            = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    a->length               = 0;
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+}
+
+int grib_accessor_class_sum_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_sum_t* self = (grib_accessor_sum_t*)a;
+    int ret                 = 0;
+    size_t size             = 0;
+    long* values            = 0;
+    long i;
+    long count = 0;
+
+    ret = value_count(a, &count);
+    if (ret)
+        return ret;
+    size = count;
+
+    if (size == 0) {
+        *val = 0;
+        return GRIB_SUCCESS;
+    }
+    values = (long*)grib_context_malloc_clear(a->context, sizeof(long) * size);
+    if (!values)
+        return GRIB_OUT_OF_MEMORY;
+
+    grib_get_long_array(grib_handle_of_accessor(a), self->values, values, &size);
+
+    *val = 0;
+    for (i = 0; i < size; i++)
+        *val += values[i];
+
+    grib_context_free(a->context, values);
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_sum_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_sum_t* self = (grib_accessor_sum_t*)a;
+    int ret                 = 0;
+    size_t size             = 0;
+    double* values          = 0;
+    long i;
+    long count = 0;
+
+    ret = value_count(a, &count);
+    if (ret)
+        return ret;
+    size = count;
+
+    if (size == 0) {
+        *val = 0;
+        return GRIB_SUCCESS;
+    }
+    values = (double*)grib_context_malloc_clear(a->context, sizeof(double) * size);
+    if (!values)
+        return GRIB_OUT_OF_MEMORY;
+
+    ret = grib_get_double_array(grib_handle_of_accessor(a), self->values, values, &size);
+    if (ret) {
+        grib_context_free(a->context, values);
+        return ret;
+    }
+    *val = 0;
+    for (i = 0; i < size; i++)
+        *val += values[i];
+
+    grib_context_free(a->context, values);
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_sum_t::value_count(grib_accessor* a, long* count){
+    grib_accessor_sum_t* self = (grib_accessor_sum_t*)a;
+    size_t n                = 0;
+    int ret                 = 0;
+
+    ret    = grib_get_size(grib_handle_of_accessor(a), self->values, &n);
+    *count = n;
+
+    if (ret)
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "%s is unable to get size of %s", a->name, self->values);
+
+    return ret;
+}
diff --git a/src/accessor/grib_accessor_class_sum.h b/src/accessor/grib_accessor_class_sum.h
new file mode 100644
index 000000000..ceedb788a
--- /dev/null
+++ b/src/accessor/grib_accessor_class_sum.h
@@ -0,0 +1,35 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_sum_h
+#define eccodes_accessor_sum_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_double.h"
+
+class grib_accessor_sum_t : public grib_accessor_double_t
+{
+public:
+    /* Members defined in sum */
+    const char*    values;
+};
+
+class grib_accessor_class_sum_t : public grib_accessor_class_double_t
+{
+public:
+    grib_accessor_class_sum_t(const char* name) : grib_accessor_class_double_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_sum_t{}; }
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_sum_h */
diff --git a/src/accessor/grib_accessor_class_suppressed.cc b/src/accessor/grib_accessor_class_suppressed.cc
new file mode 100644
index 000000000..a209e8326
--- /dev/null
+++ b/src/accessor/grib_accessor_class_suppressed.cc
@@ -0,0 +1,65 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_suppressed.h"
+
+grib_accessor_class_suppressed_t _grib_accessor_class_suppressed{"suppressed"};
+grib_accessor_class* grib_accessor_class_suppressed = &_grib_accessor_class_suppressed;
+
+
+void grib_accessor_class_suppressed_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_suppressed_t* self = (grib_accessor_suppressed_t*)a;
+    self->args                     = c;
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
+    a->length = 0;
+}
+
+void log_message(grib_accessor* a){
+    grib_accessor_suppressed_t* self = (grib_accessor_suppressed_t*)a;
+    int i                          = 0;
+    grib_handle* hand              = grib_handle_of_accessor(a);
+
+    grib_context_log(a->context, GRIB_LOG_ERROR,
+                     "key '%s' is unavailable in this version.", a->name);
+    grib_context_log(a->context, GRIB_LOG_ERROR,
+                     "Please use the following key(s):");
+    while (grib_arguments_get_name(hand, self->args, i)) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "\t- %s",
+                         grib_arguments_get_name(hand, self->args, i));
+        i++;
+    }
+}
+
+int grib_accessor_class_suppressed_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    log_message(a);
+    return GRIB_NOT_FOUND;
+}
+
+int grib_accessor_class_suppressed_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    log_message(a);
+    return GRIB_NOT_FOUND;
+}
+
+int grib_accessor_class_suppressed_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    log_message(a);
+    return GRIB_NOT_FOUND;
+}
+
+int grib_accessor_class_suppressed_t::value_count(grib_accessor* a, long* count){
+    *count = 1;
+    return 0;
+}
+
+int grib_accessor_class_suppressed_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_STRING;
+}
diff --git a/src/accessor/grib_accessor_class_suppressed.h b/src/accessor/grib_accessor_class_suppressed.h
new file mode 100644
index 000000000..c8a93274e
--- /dev/null
+++ b/src/accessor/grib_accessor_class_suppressed.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_suppressed_h
+#define eccodes_accessor_suppressed_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_suppressed_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in suppressed */
+    grib_arguments* args;
+};
+
+class grib_accessor_class_suppressed_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_suppressed_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_suppressed_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_suppressed_h */
diff --git a/src/accessor/grib_accessor_class_time.cc b/src/accessor/grib_accessor_class_time.cc
new file mode 100644
index 000000000..e31de829f
--- /dev/null
+++ b/src/accessor/grib_accessor_class_time.cc
@@ -0,0 +1,113 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_time.h"
+
+grib_accessor_class_time_t _grib_accessor_class_time{"time"};
+grib_accessor_class* grib_accessor_class_time = &_grib_accessor_class_time;
+
+
+void grib_accessor_class_time_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_time_t* self = (grib_accessor_time_t*)a;
+    grib_handle* hand        = grib_handle_of_accessor(a);
+    int n                    = 0;
+
+    self->hour   = grib_arguments_get_name(hand, c, n++);
+    self->minute = grib_arguments_get_name(hand, c, n++);
+    self->second = grib_arguments_get_name(hand, c, n++);
+}
+
+int grib_accessor_class_time_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    const grib_accessor_time_t* self = (grib_accessor_time_t*)a;
+
+    int ret = 0;
+    long hour = 0, minute = 0, second = 0;
+    grib_handle* hand = grib_handle_of_accessor(a);
+
+    if ((ret = grib_get_long_internal(hand, self->hour, &hour)) != GRIB_SUCCESS)
+        return ret;
+    if ((ret = grib_get_long_internal(hand, self->minute, &minute)) != GRIB_SUCCESS)
+        return ret;
+    if ((ret = grib_get_long_internal(hand, self->second, &second)) != GRIB_SUCCESS)
+        return ret;
+
+    /* We ignore the 'seconds' in our time calculation! */
+    if (second != 0) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                "Key %s (%s): Truncating time: non-zero seconds(%ld) ignored", a->name, __func__, second);
+    }
+
+    if (*len < 1)
+        return GRIB_WRONG_ARRAY_SIZE;
+
+    *val = hour * 100 + minute;
+
+    if (hour == 255) {
+        *val = 12 * 100;
+    }
+    if (hour != 255 && minute == 255) {
+        *val = hour * 100;
+    }
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_time_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    const grib_accessor_time_t* self = (grib_accessor_time_t*)a;
+
+    int ret = 0;
+    long v = val[0];
+    grib_handle* hand = grib_handle_of_accessor(a);
+    long hour = 0, minute = 0, second = 0;
+
+    if (*len != 1)
+        return GRIB_WRONG_ARRAY_SIZE;
+
+    if (!is_time_valid(v)) {
+        // ECC-1777: For now just a warning. Will later change to an error
+        fprintf(stderr, "ECCODES WARNING :  %s:%s: Time is not valid! hour=%ld min=%ld sec=%ld\n",
+                a->cclass->name, __func__, hour, minute, second);
+        // return GRIB_ENCODING_ERROR;
+    }
+
+    hour   = v / 100;
+    minute = v % 100;
+    second = 0; /* We ignore the 'seconds' in our time calculation! */
+
+    if ((ret = grib_set_long_internal(hand, self->hour, hour)) != GRIB_SUCCESS)
+        return ret;
+    if ((ret = grib_set_long_internal(hand, self->minute, minute)) != GRIB_SUCCESS)
+        return ret;
+    if ((ret = grib_set_long_internal(hand, self->second, second)) != GRIB_SUCCESS)
+        return ret;
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_time_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    long v = 0;
+    size_t lsize = 1, lmin = 5;
+
+    unpack_long(a, &v, &lsize);
+
+    if (*len < lmin) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
+                         a->cclass->name, a->name, lmin, *len);
+        *len = lmin;
+        return GRIB_BUFFER_TOO_SMALL;
+    }
+
+    snprintf(val, 64, "%04ld", v);
+
+    len[0] = lmin;
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_time.h b/src/accessor/grib_accessor_class_time.h
new file mode 100644
index 000000000..b1826e1d6
--- /dev/null
+++ b/src/accessor/grib_accessor_class_time.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_time_h
+#define eccodes_accessor_time_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_time_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in time */
+    const char* hour;
+    const char* minute;
+    const char* second;
+};
+
+class grib_accessor_class_time_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_time_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_time_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_time_h */
diff --git a/src/accessor/grib_accessor_class_to_double.cc b/src/accessor/grib_accessor_class_to_double.cc
new file mode 100644
index 000000000..8e9e8a0dc
--- /dev/null
+++ b/src/accessor/grib_accessor_class_to_double.cc
@@ -0,0 +1,130 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_to_double.h"
+
+grib_accessor_class_to_double_t _grib_accessor_class_to_double{"to_double"};
+grib_accessor_class* grib_accessor_class_to_double = &_grib_accessor_class_to_double;
+
+
+void grib_accessor_class_to_double_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    grib_accessor_to_double_t* self = (grib_accessor_to_double_t*)a;
+
+    self->key    = grib_arguments_get_name(grib_handle_of_accessor(a), arg, 0);
+    self->start  = grib_arguments_get_long(grib_handle_of_accessor(a), arg, 1);
+    self->length = grib_arguments_get_long(grib_handle_of_accessor(a), arg, 2);
+    self->scale  = grib_arguments_get_long(grib_handle_of_accessor(a), arg, 3);
+    if (!self->scale)
+        self->scale = 1;
+
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->length = 0;
+}
+
+int grib_accessor_class_to_double_t::value_count(grib_accessor* a, long* count){
+    grib_accessor_to_double_t* self = (grib_accessor_to_double_t*)a;
+    size_t size                   = 0;
+
+    int err = grib_get_size(grib_handle_of_accessor(a), self->key, &size);
+    *count  = size;
+
+    return err;
+}
+
+size_t grib_accessor_class_to_double_t::string_length(grib_accessor* a){
+    grib_accessor_to_double_t* self = (grib_accessor_to_double_t*)a;
+    size_t size                   = 0;
+
+    if (self->length)
+        return self->length;
+
+    grib_get_string_length_acc(a, &size);
+    return size;
+}
+
+void grib_accessor_class_to_double_t::dump(grib_accessor* a, grib_dumper* dumper){
+    grib_dump_string(dumper, a, NULL);
+}
+
+int grib_accessor_class_to_double_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_LONG;
+}
+
+int grib_accessor_class_to_double_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    grib_accessor_to_double_t* self = (grib_accessor_to_double_t*)a;
+
+    int err = 0;
+    char buff[512] = {0,};
+    size_t size = 512;
+    size_t length = string_length(a);
+
+    if (*len < length + 1) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "unpack_string: Wrong size (%lu) for %s, it contains %ld values",
+                *len, a->name, a->length + 1);
+        *len = length + 1;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    err = grib_get_string(grib_handle_of_accessor(a), self->key, buff, &size);
+    if (err)
+        return err;
+    if (length > size) {
+        err    = GRIB_STRING_TOO_SMALL;
+        length = size;
+    }
+
+    memcpy(val, buff + self->start, length);
+
+    val[length] = 0;
+    *len = length;
+    return err;
+}
+
+int grib_accessor_class_to_double_t::unpack_long(grib_accessor* a, long* v, size_t* len){
+    grib_accessor_to_double_t* self = (grib_accessor_to_double_t*)a;
+    char val[1024]                = {0,};
+    size_t l   = sizeof(val);
+    char* last = NULL;
+    int err    = a->unpack_string(val, &l);
+    if (err)
+        return err;
+
+    *v = strtol(val, &last, 10);
+    if (*last) {
+        err = GRIB_WRONG_CONVERSION;
+    }
+    *v /= self->scale;
+
+    return err;
+}
+
+int grib_accessor_class_to_double_t::unpack_double(grib_accessor* a, double* v, size_t* len){
+    grib_accessor_to_double_t* self = (grib_accessor_to_double_t*)a;
+    char val[1024]                = {0,};
+    size_t l   = sizeof(val);
+    char* last = NULL;
+    int err    = a->unpack_string(val, &l);
+    if (err)
+        return err;
+
+    *v = strtod(val, &last);
+    if (*last) {
+        err = GRIB_WRONG_CONVERSION;
+    }
+    *v /= self->scale;
+
+    return err;
+}
+
+long grib_accessor_class_to_double_t::next_offset(grib_accessor* a){
+    return a->offset + a->length;
+}
diff --git a/src/accessor/grib_accessor_class_to_double.h b/src/accessor/grib_accessor_class_to_double.h
new file mode 100644
index 000000000..a2010cc1e
--- /dev/null
+++ b/src/accessor/grib_accessor_class_to_double.h
@@ -0,0 +1,43 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_to_double_h
+#define eccodes_accessor_to_double_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_to_double_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in to_double */
+    const char* key;
+    long start;
+    size_t length;
+    long scale;
+};
+
+class grib_accessor_class_to_double_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_to_double_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_to_double_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    size_t string_length(grib_accessor*) override;
+    long next_offset(grib_accessor*) override;
+    int value_count(grib_accessor*, long*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_to_double_h */
diff --git a/src/accessor/grib_accessor_class_to_integer.cc b/src/accessor/grib_accessor_class_to_integer.cc
new file mode 100644
index 000000000..06f268974
--- /dev/null
+++ b/src/accessor/grib_accessor_class_to_integer.cc
@@ -0,0 +1,132 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_to_integer.h"
+
+grib_accessor_class_to_integer_t _grib_accessor_class_to_integer{"to_integer"};
+grib_accessor_class* grib_accessor_class_to_integer = &_grib_accessor_class_to_integer;
+
+
+void grib_accessor_class_to_integer_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    grib_accessor_to_integer_t* self = (grib_accessor_to_integer_t*)a;
+
+    self->key    = grib_arguments_get_name(grib_handle_of_accessor(a), arg, 0);
+    self->start  = grib_arguments_get_long(grib_handle_of_accessor(a), arg, 1);
+    self->length = grib_arguments_get_long(grib_handle_of_accessor(a), arg, 2);
+
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->length = 0;
+}
+
+int grib_accessor_class_to_integer_t::value_count(grib_accessor* a, long* count){
+    grib_accessor_to_integer_t* self = (grib_accessor_to_integer_t*)a;
+    size_t size                    = 0;
+
+    int err = grib_get_size(grib_handle_of_accessor(a), self->key, &size);
+    *count  = size;
+
+    return err;
+}
+
+size_t grib_accessor_class_to_integer_t::string_length(grib_accessor* a){
+    grib_accessor_to_integer_t* self = (grib_accessor_to_integer_t*)a;
+    size_t size                    = 0;
+
+    if (self->length)
+        return self->length;
+
+    grib_get_string_length(grib_handle_of_accessor(a), self->key, &size);
+    return size;
+}
+
+void grib_accessor_class_to_integer_t::dump(grib_accessor* a, grib_dumper* dumper){
+    grib_dump_long(dumper, a, NULL);
+}
+
+int grib_accessor_class_to_integer_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_LONG;
+}
+
+int grib_accessor_class_to_integer_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    grib_accessor_to_integer_t* self = (grib_accessor_to_integer_t*)a;
+
+    int err = 0;
+    char buff[512] = {0,};
+    size_t size = 512;
+
+    size_t length = string_length(a);
+
+    if (*len < length + 1) {
+        const char* cclass_name = a->cclass->name;
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
+                         cclass_name, a->name, length+1, *len);
+        *len = length + 1;
+        return GRIB_BUFFER_TOO_SMALL;
+    }
+
+    err = grib_get_string(grib_handle_of_accessor(a), self->key, buff, &size);
+    if (err)
+        return err;
+    if (length > size) {
+        /*err=GRIB_STRING_TOO_SMALL;*/
+        length = size;
+    }
+
+    memcpy(val, buff + self->start, length);
+
+    val[length] = 0;
+    *len = length;
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_to_integer_t::pack_string(grib_accessor* a, const char* val, size_t* len){
+    return GRIB_NOT_IMPLEMENTED;
+}
+
+int grib_accessor_class_to_integer_t::pack_long(grib_accessor* a, const long* v, size_t* len){
+    grib_context_log(a->context, GRIB_LOG_ERROR, "Should not pack %s as an integer", a->name);
+    return GRIB_NOT_IMPLEMENTED;
+}
+
+int grib_accessor_class_to_integer_t::pack_double(grib_accessor* a, const double* v, size_t* len){
+    grib_context_log(a->context, GRIB_LOG_ERROR, "Should not pack %s as a double", a->name);
+    return GRIB_NOT_IMPLEMENTED;
+}
+
+int grib_accessor_class_to_integer_t::unpack_long(grib_accessor* a, long* v, size_t* len){
+    char val[1024] = {0,};
+    size_t l   = sizeof(val);
+    char* last = NULL;
+    int err    = unpack_string(a, val, &l);
+
+    if (err)
+        return err;
+
+    *v = strtol(val, &last, 10);
+    /* if (*last) {err=GRIB_WRONG_CONVERSION;} */
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_to_integer_t::unpack_double(grib_accessor* a, double* v, size_t* len){
+    size_t l = 1;
+    long val = 0;
+    int err  = unpack_long(a, &val, &l);
+
+    *v = (double)val;
+    return err;
+}
+
+long grib_accessor_class_to_integer_t::next_offset(grib_accessor* a){
+    return a->offset + a->length;
+}
diff --git a/src/accessor/grib_accessor_class_to_integer.h b/src/accessor/grib_accessor_class_to_integer.h
new file mode 100644
index 000000000..3ee9dd87b
--- /dev/null
+++ b/src/accessor/grib_accessor_class_to_integer.h
@@ -0,0 +1,45 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_to_integer_h
+#define eccodes_accessor_to_integer_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_to_integer_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in to_integer */
+    const char* key;
+    long start;
+    size_t length;
+};
+
+class grib_accessor_class_to_integer_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_to_integer_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_to_integer_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int pack_string(grib_accessor*, const char*, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    size_t string_length(grib_accessor*) override;
+    long next_offset(grib_accessor*) override;
+    int value_count(grib_accessor*, long*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_to_integer_h */
diff --git a/src/accessor/grib_accessor_class_to_string.cc b/src/accessor/grib_accessor_class_to_string.cc
new file mode 100644
index 000000000..fd70a7feb
--- /dev/null
+++ b/src/accessor/grib_accessor_class_to_string.cc
@@ -0,0 +1,120 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_to_string.h"
+
+grib_accessor_class_to_string_t _grib_accessor_class_to_string{"to_string"};
+grib_accessor_class* grib_accessor_class_to_string = &_grib_accessor_class_to_string;
+
+
+void grib_accessor_class_to_string_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    grib_accessor_to_string_t* self = (grib_accessor_to_string_t*)a;
+
+    self->key    = grib_arguments_get_name(grib_handle_of_accessor(a), arg, 0);
+    self->start  = grib_arguments_get_long(grib_handle_of_accessor(a), arg, 1);
+    self->length = grib_arguments_get_long(grib_handle_of_accessor(a), arg, 2);
+
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->length = 0;
+}
+
+int grib_accessor_class_to_string_t::value_count(grib_accessor* a, long* count){
+    grib_accessor_to_string_t* self = (grib_accessor_to_string_t*)a;
+    size_t size                   = 0;
+
+    int err = grib_get_size(grib_handle_of_accessor(a), self->key, &size);
+    *count  = size;
+
+    return err;
+}
+
+size_t grib_accessor_class_to_string_t::string_length(grib_accessor* a){
+    grib_accessor_to_string_t* self = (grib_accessor_to_string_t*)a;
+
+    if (self->length)
+        return self->length;
+
+    size_t size = 0;
+    grib_get_string_length(grib_handle_of_accessor(a), self->key, &size);
+    return size;
+}
+
+void grib_accessor_class_to_string_t::dump(grib_accessor* a, grib_dumper* dumper){
+    grib_dump_string(dumper, a, NULL);
+}
+
+int grib_accessor_class_to_string_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_STRING;
+}
+
+int grib_accessor_class_to_string_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    grib_accessor_to_string_t* self = (grib_accessor_to_string_t*)a;
+
+    int err = 0;
+    char buff[512] = {0,};
+
+    size_t length = string_length(a);
+
+    if (*len < length + 1) {
+        const char* cclass_name = a->cclass->name;
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
+                         cclass_name, a->name, length+1, *len);
+        *len = length + 1;
+        return GRIB_BUFFER_TOO_SMALL;
+    }
+
+    size_t size = sizeof(buff);
+    err = grib_get_string(grib_handle_of_accessor(a), self->key, buff, &size);
+    if (err)
+        return err;
+    if (length > size) {
+        /*err=GRIB_STRING_TOO_SMALL;*/
+        length = size;
+    }
+
+    memcpy(val, buff + self->start, length);
+
+    val[length] = 0;
+    *len = length;
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_to_string_t::unpack_long(grib_accessor* a, long* v, size_t* len){
+    char val[1024] = {0,};
+    size_t l   = sizeof(val);
+    char* last = NULL;
+    int err    = unpack_string(a, val, &l);
+
+    if (err)
+        return err;
+
+    *v = strtol(val, &last, 10);
+    if (*last) {
+        err = GRIB_WRONG_CONVERSION;
+    }
+
+    return err;
+}
+
+int grib_accessor_class_to_string_t::unpack_double(grib_accessor* a, double* v, size_t* len){
+    size_t l = 1;
+    long val = 0;
+    int err  = unpack_long(a, &val, &l);
+
+    *v = (double)val;
+    return err;
+}
+
+long grib_accessor_class_to_string_t::next_offset(grib_accessor* a){
+    return a->offset + a->length;
+}
diff --git a/src/accessor/grib_accessor_class_to_string.h b/src/accessor/grib_accessor_class_to_string.h
new file mode 100644
index 000000000..0907cb82c
--- /dev/null
+++ b/src/accessor/grib_accessor_class_to_string.h
@@ -0,0 +1,42 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_to_string_h
+#define eccodes_accessor_to_string_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_to_string_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in to_string */
+    const char* key;
+    long start;
+    size_t length;
+};
+
+class grib_accessor_class_to_string_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_to_string_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_to_string_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    size_t string_length(grib_accessor*) override;
+    long next_offset(grib_accessor*) override;
+    int value_count(grib_accessor*, long*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_to_string_h */
diff --git a/src/accessor/grib_accessor_class_transient_darray.cc b/src/accessor/grib_accessor_class_transient_darray.cc
new file mode 100644
index 000000000..d5372e3ca
--- /dev/null
+++ b/src/accessor/grib_accessor_class_transient_darray.cc
@@ -0,0 +1,111 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_transient_darray.h"
+
+grib_accessor_class_transient_darray_t _grib_accessor_class_transient_darray{"transient_darray"};
+grib_accessor_class* grib_accessor_class_transient_darray = &_grib_accessor_class_transient_darray;
+
+
+void grib_accessor_class_transient_darray_t::init(grib_accessor* a, const long length, grib_arguments* args){
+    grib_accessor_transient_darray_t* self = (grib_accessor_transient_darray_t*)a;
+    self->arr                            = NULL;
+    self->type                           = GRIB_TYPE_DOUBLE;
+    a->length                            = 0;
+}
+
+void grib_accessor_class_transient_darray_t::dump(grib_accessor* a, grib_dumper* dumper){
+    grib_dump_double(dumper, a, NULL);
+}
+
+int grib_accessor_class_transient_darray_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_transient_darray_t* self = (grib_accessor_transient_darray_t*)a;
+
+    if (self->arr)
+        grib_darray_delete(a->context, self->arr);
+    self->arr = grib_darray_new(a->context, *len, 10);
+
+    for (size_t i = 0; i < *len; i++)
+        grib_darray_push(a->context, self->arr, val[i]);
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_transient_darray_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_transient_darray_t* self = (grib_accessor_transient_darray_t*)a;
+
+    if (self->arr)
+        grib_darray_delete(a->context, self->arr);
+    self->arr = grib_darray_new(a->context, *len, 10);
+
+    for (size_t i = 0; i < *len; i++)
+        grib_darray_push(a->context, self->arr, (double)val[i]);
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_transient_darray_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_transient_darray_t* self = (grib_accessor_transient_darray_t*)a;
+    long count = 0;
+
+    value_count(a, &count);
+
+    if (*len < count) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s (setting %ld, required %ld) ", a->name, *len, count);
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    *len = count;
+    for (size_t i = 0; i < *len; i++)
+        val[i] = self->arr->v[i];
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_transient_darray_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_transient_darray_t* self = (grib_accessor_transient_darray_t*)a;
+    long count = 0;
+
+    value_count(a, &count);
+
+    if (*len < count) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s (setting %ld, required %ld) ", a->name, *len, count);
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    *len = count;
+    for (size_t i = 0; i < *len; i++)
+        val[i] = (long)self->arr->v[i];
+
+    return GRIB_SUCCESS;
+}
+
+void grib_accessor_class_transient_darray_t::destroy(grib_context* c, grib_accessor* a){
+    grib_accessor_transient_darray_t* self = (grib_accessor_transient_darray_t*)a;
+    if (self->arr)
+        grib_darray_delete(a->context, self->arr);
+}
+
+int grib_accessor_class_transient_darray_t::value_count(grib_accessor* a, long* count){
+    grib_accessor_transient_darray_t* self = (grib_accessor_transient_darray_t*)a;
+    if (self->arr)
+        *count = grib_darray_used_size(self->arr);
+    else
+        *count = 0;
+
+    return 0;
+}
+
+int grib_accessor_class_transient_darray_t::get_native_type(grib_accessor* a){
+    const grib_accessor_transient_darray_t* self = (grib_accessor_transient_darray_t*)a;
+    return self->type;
+}
diff --git a/src/accessor/grib_accessor_class_transient_darray.h b/src/accessor/grib_accessor_class_transient_darray.h
new file mode 100644
index 000000000..fe918bd55
--- /dev/null
+++ b/src/accessor/grib_accessor_class_transient_darray.h
@@ -0,0 +1,41 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_transient_darray_h
+#define eccodes_accessor_transient_darray_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_transient_darray_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in transient_darray */
+    grib_darray* arr;
+    int type;
+};
+
+class grib_accessor_class_transient_darray_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_transient_darray_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_transient_darray_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void destroy(grib_context*, grib_accessor*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_transient_darray_h */
diff --git a/src/accessor/grib_accessor_class_trim.cc b/src/accessor/grib_accessor_class_trim.cc
new file mode 100644
index 000000000..8f45138fe
--- /dev/null
+++ b/src/accessor/grib_accessor_class_trim.cc
@@ -0,0 +1,76 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_trim.h"
+
+grib_accessor_class_trim_t _grib_accessor_class_trim{"trim"};
+grib_accessor_class* grib_accessor_class_trim = &_grib_accessor_class_trim;
+
+
+void grib_accessor_class_trim_t::init(grib_accessor* a, const long l, grib_arguments* arg){
+    int n                    = 0;
+    grib_accessor_trim_t* self = (grib_accessor_trim_t*)a;
+    grib_handle* h           = grib_handle_of_accessor(a);
+
+    self->input     = grib_arguments_get_name(h, arg, n++);
+    self->trim_left = grib_arguments_get_long(h, arg, n++);
+    self->trim_right= grib_arguments_get_long(h, arg, n++);
+    DEBUG_ASSERT(self->trim_left == 0 || self->trim_left == 1);
+    DEBUG_ASSERT(self->trim_right == 0 || self->trim_right == 1);
+}
+
+int grib_accessor_class_trim_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    grib_accessor_trim_t* self = (grib_accessor_trim_t*)a;
+
+    int err        = 0;
+    grib_handle* h = grib_handle_of_accessor(a);
+    char input[256] = {0,};
+    size_t size    = sizeof(input) / sizeof(*input);
+    char* pInput   = input;
+
+    err = grib_get_string(h, self->input, input, &size);
+    if (err) return err;
+
+    string_lrtrim(&pInput, self->trim_left, self->trim_right);
+    snprintf(val, 1024, "%s", pInput);
+    size = strlen(val);
+    *len = size + 1;
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_trim_t::pack_string(grib_accessor* a, const char* val, size_t* len){
+    char input[256] = {0,};
+
+    size_t inputLen = 256;
+    char buf[256]   = {0,};
+    char* pBuf = NULL;
+    int err;
+    grib_handle* h = grib_handle_of_accessor(a);
+    grib_accessor_trim_t* self = (grib_accessor_trim_t*)a;
+    grib_accessor* inputAccesstor = grib_find_accessor(h, self->input);
+    if (!inputAccesstor) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "Accessor for %s not found", self->input);
+        return GRIB_NOT_FOUND;
+    }
+
+    if ((err = grib_get_string(h, self->input, input, &inputLen)) != GRIB_SUCCESS)
+        return err;
+
+    snprintf(buf, sizeof(buf), "%s", val);
+    pBuf = buf;
+    string_lrtrim(&pBuf, self->trim_left, self->trim_right);
+
+    return inputAccesstor->pack_string(pBuf, len);}
+
+size_t grib_accessor_class_trim_t::string_length(grib_accessor* a){
+    return 1024;
+}
diff --git a/src/accessor/grib_accessor_class_trim.h b/src/accessor/grib_accessor_class_trim.h
new file mode 100644
index 000000000..9fd6b9230
--- /dev/null
+++ b/src/accessor/grib_accessor_class_trim.h
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_trim_h
+#define eccodes_accessor_trim_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_ascii.h"
+
+class grib_accessor_trim_t : public grib_accessor_ascii_t
+{
+public:
+    /* Members defined in trim */
+    const char* input;
+    int trim_left;
+    int trim_right;
+};
+
+class grib_accessor_class_trim_t : public grib_accessor_class_ascii_t
+{
+public:
+    grib_accessor_class_trim_t(const char* name) : grib_accessor_class_ascii_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_trim_t{}; }
+    int pack_string(grib_accessor*, const char*, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    size_t string_length(grib_accessor*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_trim_h */
diff --git a/src/accessor/grib_accessor_class_uint16.cc b/src/accessor/grib_accessor_class_uint16.cc
new file mode 100644
index 000000000..b8476105c
--- /dev/null
+++ b/src/accessor/grib_accessor_class_uint16.cc
@@ -0,0 +1,35 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_uint16.h"
+
+grib_accessor_class_uint16_t _grib_accessor_class_uint16{"uint16"};
+grib_accessor_class* grib_accessor_class_uint16 = &_grib_accessor_class_uint16;
+
+
+int grib_accessor_class_uint16_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    long value = 0;
+    /*long pos = a->offset;*/
+    /*unsigned char* data = grib_handle_of_accessor(a)->buffer->data;*/
+
+    if (*len < 1) {
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    *val = value;
+    *len = 1;
+    return GRIB_NOT_IMPLEMENTED;
+}
+
+int grib_accessor_class_uint16_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_LONG;
+}
diff --git a/src/accessor/grib_accessor_class_uint16.h b/src/accessor/grib_accessor_class_uint16.h
new file mode 100644
index 000000000..0291df85c
--- /dev/null
+++ b/src/accessor/grib_accessor_class_uint16.h
@@ -0,0 +1,32 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_uint16_h
+#define eccodes_accessor_uint16_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_uint16_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in uint16 */
+};
+
+class grib_accessor_class_uint16_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_uint16_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_uint16_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+};
+#endif /* eccodes_accessor_uint16_h */
diff --git a/src/accessor/grib_accessor_class_uint32.cc b/src/accessor/grib_accessor_class_uint32.cc
new file mode 100644
index 000000000..6465375b6
--- /dev/null
+++ b/src/accessor/grib_accessor_class_uint32.cc
@@ -0,0 +1,35 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_uint32.h"
+
+grib_accessor_class_uint32_t _grib_accessor_class_uint32{"uint32"};
+grib_accessor_class* grib_accessor_class_uint32 = &_grib_accessor_class_uint32;
+
+
+int grib_accessor_class_uint32_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    long value = 0;
+    /* long pos = a->offset; */
+    /* unsigned char* data = grib_handle_of_accessor(a)->buffer->data; */
+
+    if (*len < 1) {
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    *val = value;
+    *len = 1;
+    return GRIB_NOT_IMPLEMENTED;
+}
+
+int grib_accessor_class_uint32_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_LONG;
+}
diff --git a/src/accessor/grib_accessor_class_uint32.h b/src/accessor/grib_accessor_class_uint32.h
new file mode 100644
index 000000000..be0457156
--- /dev/null
+++ b/src/accessor/grib_accessor_class_uint32.h
@@ -0,0 +1,32 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_uint32_h
+#define eccodes_accessor_uint32_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_uint32_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in uint32 */
+};
+
+class grib_accessor_class_uint32_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_uint32_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_uint32_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+};
+#endif /* eccodes_accessor_uint32_h */
diff --git a/src/accessor/grib_accessor_class_uint32_little_endian.cc b/src/accessor/grib_accessor_class_uint32_little_endian.cc
new file mode 100644
index 000000000..7800d30c0
--- /dev/null
+++ b/src/accessor/grib_accessor_class_uint32_little_endian.cc
@@ -0,0 +1,35 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_uint32_little_endian.h"
+
+grib_accessor_class_uint32_little_endian_t _grib_accessor_class_uint32_little_endian{"uint32_little_endian"};
+grib_accessor_class* grib_accessor_class_uint32_little_endian = &_grib_accessor_class_uint32_little_endian;
+
+
+int grib_accessor_class_uint32_little_endian_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    long value = 0;
+    /* long pos = a->offset; */
+    /* unsigned char* data = grib_handle_of_accessor(a)->buffer->data; */
+
+    if (*len < 1) {
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    *val = value;
+    *len = 1;
+    return GRIB_NOT_IMPLEMENTED;
+}
+
+int grib_accessor_class_uint32_little_endian_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_LONG;
+}
diff --git a/src/accessor/grib_accessor_class_uint32_little_endian.h b/src/accessor/grib_accessor_class_uint32_little_endian.h
new file mode 100644
index 000000000..4f51d3113
--- /dev/null
+++ b/src/accessor/grib_accessor_class_uint32_little_endian.h
@@ -0,0 +1,32 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_uint32_little_endian_h
+#define eccodes_accessor_uint32_little_endian_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_uint32_little_endian_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in uint32_little_endian */
+};
+
+class grib_accessor_class_uint32_little_endian_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_uint32_little_endian_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_uint32_little_endian_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+};
+#endif /* eccodes_accessor_uint32_little_endian_h */
diff --git a/src/accessor/grib_accessor_class_uint64.cc b/src/accessor/grib_accessor_class_uint64.cc
new file mode 100644
index 000000000..302702dab
--- /dev/null
+++ b/src/accessor/grib_accessor_class_uint64.cc
@@ -0,0 +1,51 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_uint64.h"
+
+grib_accessor_class_uint64_t _grib_accessor_class_uint64{"uint64"};
+grib_accessor_class* grib_accessor_class_uint64 = &_grib_accessor_class_uint64;
+
+
+int grib_accessor_class_uint64_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    long value                = 0;
+    long pos                  = a->offset;
+    unsigned char* data       = grib_handle_of_accessor(a)->buffer->data;
+    unsigned long long result = 0, tmp;
+    int i;
+
+    if (*len < 1) {
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    for (i = 0; i < 8; i++) {
+        result <<= 8;
+        result |= data[pos + i];
+    }
+
+    value = result;
+    tmp   = value;
+
+    /* Result does not fit in long */
+    if (tmp != result) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "Value for %s cannot be decoded as a 'long' (%llu)", a->name, result);
+        return GRIB_DECODING_ERROR;
+    }
+
+    *val = value;
+    *len = 1;
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_uint64_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_LONG;
+}
diff --git a/src/accessor/grib_accessor_class_uint64.h b/src/accessor/grib_accessor_class_uint64.h
new file mode 100644
index 000000000..04d96b1b8
--- /dev/null
+++ b/src/accessor/grib_accessor_class_uint64.h
@@ -0,0 +1,32 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_uint64_h
+#define eccodes_accessor_uint64_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_uint64_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in uint64 */
+};
+
+class grib_accessor_class_uint64_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_uint64_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_uint64_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+};
+#endif /* eccodes_accessor_uint64_h */
diff --git a/src/accessor/grib_accessor_class_uint64_little_endian.cc b/src/accessor/grib_accessor_class_uint64_little_endian.cc
new file mode 100644
index 000000000..80da3d903
--- /dev/null
+++ b/src/accessor/grib_accessor_class_uint64_little_endian.cc
@@ -0,0 +1,51 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_uint64_little_endian.h"
+
+grib_accessor_class_uint64_little_endian_t _grib_accessor_class_uint64_little_endian{"uint64_little_endian"};
+grib_accessor_class* grib_accessor_class_uint64_little_endian = &_grib_accessor_class_uint64_little_endian;
+
+
+int grib_accessor_class_uint64_little_endian_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    long value                = 0;
+    long pos                  = a->offset;
+    unsigned char* data       = grib_handle_of_accessor(a)->buffer->data;
+    unsigned long long result = 0, tmp;
+    int i;
+
+    if (*len < 1) {
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    for (i = 7; i >= 0; i--) {
+        result <<= 8;
+        result |= data[pos + i];
+    }
+
+    value = result;
+    tmp   = value;
+
+    /* Result does not fit in long */
+    if (tmp != result) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "Value for %s cannot be decoded as a 'long' (%llu)", a->name, result);
+        return GRIB_DECODING_ERROR;
+    }
+
+    *val = value;
+    *len = 1;
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_uint64_little_endian_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_LONG;
+}
diff --git a/src/accessor/grib_accessor_class_uint64_little_endian.h b/src/accessor/grib_accessor_class_uint64_little_endian.h
new file mode 100644
index 000000000..5eb0068bb
--- /dev/null
+++ b/src/accessor/grib_accessor_class_uint64_little_endian.h
@@ -0,0 +1,32 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_uint64_little_endian_h
+#define eccodes_accessor_uint64_little_endian_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_uint64_little_endian_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in uint64_little_endian */
+};
+
+class grib_accessor_class_uint64_little_endian_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_uint64_little_endian_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_uint64_little_endian_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+};
+#endif /* eccodes_accessor_uint64_little_endian_h */
diff --git a/src/accessor/grib_accessor_class_uint8.cc b/src/accessor/grib_accessor_class_uint8.cc
new file mode 100644
index 000000000..b86079a53
--- /dev/null
+++ b/src/accessor/grib_accessor_class_uint8.cc
@@ -0,0 +1,37 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_uint8.h"
+
+grib_accessor_class_uint8_t _grib_accessor_class_uint8{"uint8"};
+grib_accessor_class* grib_accessor_class_uint8 = &_grib_accessor_class_uint8;
+
+
+int grib_accessor_class_uint8_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    long value          = 0;
+    long pos            = a->offset;
+    unsigned char* data = grib_handle_of_accessor(a)->buffer->data;
+
+    if (*len < 1) {
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    value = data[pos];
+
+    *val = value;
+    *len = 1;
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_uint8_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_LONG;
+}
diff --git a/src/accessor/grib_accessor_class_uint8.h b/src/accessor/grib_accessor_class_uint8.h
new file mode 100644
index 000000000..8a06d0ceb
--- /dev/null
+++ b/src/accessor/grib_accessor_class_uint8.h
@@ -0,0 +1,32 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_uint8_h
+#define eccodes_accessor_uint8_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_uint8_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in uint8 */
+};
+
+class grib_accessor_class_uint8_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_uint8_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_uint8_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+};
+#endif /* eccodes_accessor_uint8_h */
diff --git a/src/accessor/grib_accessor_class_unexpanded_descriptors.cc b/src/accessor/grib_accessor_class_unexpanded_descriptors.cc
new file mode 100644
index 000000000..e51262387
--- /dev/null
+++ b/src/accessor/grib_accessor_class_unexpanded_descriptors.cc
@@ -0,0 +1,132 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_unexpanded_descriptors.h"
+
+grib_accessor_class_unexpanded_descriptors_t _grib_accessor_class_unexpanded_descriptors{"unexpanded_descriptors"};
+grib_accessor_class* grib_accessor_class_unexpanded_descriptors = &_grib_accessor_class_unexpanded_descriptors;
+
+
+void grib_accessor_class_unexpanded_descriptors_t::init(grib_accessor* a, const long len, grib_arguments* args){
+    grib_accessor_unexpanded_descriptors_t* self = (grib_accessor_unexpanded_descriptors_t*)a;
+    int n                                      = 0;
+    grib_handle* hand                          = grib_handle_of_accessor(a);
+    self->unexpandedDescriptorsEncoded         = grib_find_accessor(hand, grib_arguments_get_name(hand, args, n++));
+    self->createNewData                        = grib_arguments_get_name(hand, args, n++);
+    a->length                                  = 0;
+}
+
+int grib_accessor_class_unexpanded_descriptors_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_unexpanded_descriptors_t* self = (grib_accessor_unexpanded_descriptors_t*)a;
+    int ret                                    = 0;
+    long pos                                   = 0;
+    long rlen                                  = 0;
+    long f, x, y;
+    long* v = val;
+    long i;
+    grib_handle* hand = grib_handle_of_accessor(a);
+
+    pos = accessor_raw_get_offset(self->unexpandedDescriptorsEncoded) * 8;
+
+    ret = value_count(a, &rlen);
+    if (ret)
+        return ret;
+
+    if (rlen == 0) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "No descriptors in section 3. Malformed message.");
+        return GRIB_MESSAGE_MALFORMED;
+    }
+
+    if (*len < rlen) {
+        /* grib_context_log(a->context, GRIB_LOG_ERROR, */
+        /* " wrong size (%ld) for %s it contains %d values ",*len, a->name , rlen); */
+        *len = 0;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    for (i = 0; i < rlen; i++) {
+        f    = grib_decode_unsigned_long(hand->buffer->data, &pos, 2);
+        x    = grib_decode_unsigned_long(hand->buffer->data, &pos, 6);
+        y    = grib_decode_unsigned_long(hand->buffer->data, &pos, 8);
+        *v++ = f * 100000 + x * 1000 + y;
+    }
+    *len = rlen;
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_unexpanded_descriptors_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_unexpanded_descriptors_t* self = (grib_accessor_unexpanded_descriptors_t*)a;
+    int ret                                    = 0;
+    long pos                                   = 0;
+    unsigned long f, x, y;
+    unsigned char* buf      = NULL;
+    grib_accessor* expanded = NULL;
+    size_t buflen           = *len * 2;
+    size_t i = 0, length = *len;
+    long createNewData = 1;
+    grib_handle* hand  = grib_handle_of_accessor(a);
+
+    grib_get_long(hand, self->createNewData, &createNewData);
+
+    buf = (unsigned char*)grib_context_malloc_clear(a->context, buflen);
+
+    for (i = 0; i < length; i++) {
+        const long tmp = val[i] % 100000;
+        f              = val[i] / 100000;
+        x              = tmp / 1000;
+        y              = tmp % 1000;
+        grib_encode_unsigned_longb(buf, f, &pos, 2);
+        grib_encode_unsigned_longb(buf, x, &pos, 6);
+        grib_encode_unsigned_longb(buf, y, &pos, 8);
+    }
+
+    self->unexpandedDescriptorsEncoded->pack_bytes(buf, &buflen);    grib_context_free(hand->context, buf);
+
+    if (createNewData == 0)
+        return ret;
+
+    expanded = grib_find_accessor(hand, "expandedCodes");
+    Assert(expanded != NULL);
+    ret = grib_accessor_class_expanded_descriptors_set_do_expand(expanded, 1);
+    if (ret != GRIB_SUCCESS)
+        return ret;
+
+    ret = grib_set_long(hand, "unpack", 3); /* BUFR new data */
+    if (ret != GRIB_SUCCESS)
+        return ret;
+
+    ret = grib_set_long(hand, "unpack", 1); /* Unpack structure */
+
+    return ret;
+}
+
+int grib_accessor_class_unexpanded_descriptors_t::value_count(grib_accessor* a, long* numberOfUnexpandedDescriptors){
+    grib_accessor_unexpanded_descriptors_t* self = (grib_accessor_unexpanded_descriptors_t*)a;
+    long n                                     = 0;
+
+    self->unexpandedDescriptorsEncoded->value_count(&n);    *numberOfUnexpandedDescriptors = n / 2;
+
+    return 0;
+}
+
+long grib_accessor_class_unexpanded_descriptors_t::byte_offset(grib_accessor* a){
+    return a->offset;
+}
+
+void grib_accessor_class_unexpanded_descriptors_t::update_size(grib_accessor* a, size_t s){
+    a->length = s;
+}
+
+long grib_accessor_class_unexpanded_descriptors_t::next_offset(grib_accessor* a){
+    return byte_offset(a) + a->length;
+}
diff --git a/src/accessor/grib_accessor_class_unexpanded_descriptors.h b/src/accessor/grib_accessor_class_unexpanded_descriptors.h
new file mode 100644
index 000000000..12c89f308
--- /dev/null
+++ b/src/accessor/grib_accessor_class_unexpanded_descriptors.h
@@ -0,0 +1,39 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_unexpanded_descriptors_h
+#define eccodes_accessor_unexpanded_descriptors_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_unexpanded_descriptors_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in unexpanded_descriptors */
+    grib_accessor* unexpandedDescriptorsEncoded;
+    const char* createNewData;
+};
+
+class grib_accessor_class_unexpanded_descriptors_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_unexpanded_descriptors_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_unexpanded_descriptors_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    long byte_offset(grib_accessor*) override;
+    long next_offset(grib_accessor*) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    void update_size(grib_accessor*, size_t) override;
+};
+#endif /* eccodes_accessor_unexpanded_descriptors_h */
diff --git a/src/accessor/grib_accessor_class_unpack_bufr_values.cc b/src/accessor/grib_accessor_class_unpack_bufr_values.cc
new file mode 100644
index 000000000..f7af4f6fa
--- /dev/null
+++ b/src/accessor/grib_accessor_class_unpack_bufr_values.cc
@@ -0,0 +1,98 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_unpack_bufr_values.h"
+#include "grib_accessor_class_bufr_data_array.h"
+
+
+
+grib_accessor_class_unpack_bufr_values_t _grib_accessor_class_unpack_bufr_values{"unpack_bufr_values"};
+grib_accessor_class* grib_accessor_class_unpack_bufr_values = &_grib_accessor_class_unpack_bufr_values;
+
+
+void grib_accessor_class_unpack_bufr_values_t::init(grib_accessor* a, const long len, grib_arguments* params){
+    char* key;
+    grib_accessor_unpack_bufr_values_t* self = (grib_accessor_unpack_bufr_values_t*)a;
+    key                                    = (char*)grib_arguments_get_name(grib_handle_of_accessor(a), params, 0);
+    self->data_accessor                    = grib_find_accessor(grib_handle_of_accessor(a), key);
+
+    a->length = 0;
+}
+
+void grib_accessor_class_unpack_bufr_values_t::dump(grib_accessor* a, grib_dumper* dumper){
+}
+
+int grib_accessor_class_unpack_bufr_values_t::unpack_string_array(grib_accessor* a, char** buffer, size_t* len){
+    grib_accessor_unpack_bufr_values_t* self = (grib_accessor_unpack_bufr_values_t*)a;
+    grib_accessor* data                    = (grib_accessor*)self->data_accessor;
+
+    return data->unpack_double(0, 0);}
+
+int grib_accessor_class_unpack_bufr_values_t::unpack_string(grib_accessor* a, char* buffer, size_t* len){
+    grib_accessor_unpack_bufr_values_t* self = (grib_accessor_unpack_bufr_values_t*)a;
+    grib_accessor* data                    = (grib_accessor*)self->data_accessor;
+    strcpy(buffer, "0");
+    *len=1;
+
+    return data->unpack_double(0, 0);}
+
+int grib_accessor_class_unpack_bufr_values_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_unpack_bufr_values_t* self = (grib_accessor_unpack_bufr_values_t*)a;
+    grib_accessor* data                    = (grib_accessor*)self->data_accessor;
+
+    return data->unpack_double(0, 0);}
+
+int grib_accessor_class_unpack_bufr_values_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    grib_accessor_unpack_bufr_values_t* self = (grib_accessor_unpack_bufr_values_t*)a;
+    grib_accessor* data                    = (grib_accessor*)self->data_accessor;
+
+    return data->unpack_double(0, 0);}
+
+int grib_accessor_class_unpack_bufr_values_t::value_count(grib_accessor* a, long* count){
+    *count = 1;
+    return 0;
+}
+
+void grib_accessor_class_unpack_bufr_values_t::destroy(grib_context* context, grib_accessor* a){
+}
+
+int grib_accessor_class_unpack_bufr_values_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_LONG;
+}
+
+// static const char* mode_to_str(int p)
+// {
+//     if (p==CODES_BUFR_UNPACK_STRUCTURE) return "CODES_BUFR_UNPACK_STRUCTURE";
+//     if (p==CODES_BUFR_UNPACK_FLAT)      return "CODES_BUFR_UNPACK_FLAT";
+//     if (p==CODES_BUFR_NEW_DATA)         return "CODES_BUFR_NEW_DATA";
+//     return "unknown proc flag";
+// }
+
+int grib_accessor_class_unpack_bufr_values_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    int unpackMode                         = CODES_BUFR_UNPACK_STRUCTURE;
+    grib_accessor_unpack_bufr_values_t* self = (grib_accessor_unpack_bufr_values_t*)a;
+    grib_accessor* data                    = (grib_accessor*)self->data_accessor;
+
+    if (*val == 2)
+        unpackMode = CODES_BUFR_UNPACK_FLAT;
+    if (*val == 3)
+        unpackMode = CODES_BUFR_NEW_DATA;
+
+    accessor_bufr_data_array_set_unpackMode(data, unpackMode);
+
+    return data->unpack_double(0, 0);}
+
+int grib_accessor_class_unpack_bufr_values_t::pack_double(grib_accessor* a, const double* val, size_t* len){
+    grib_accessor_unpack_bufr_values_t* self = (grib_accessor_unpack_bufr_values_t*)a;
+    grib_accessor* data                    = (grib_accessor*)self->data_accessor;
+
+    return data->unpack_double(0, 0);}
diff --git a/src/accessor/grib_accessor_class_unpack_bufr_values.h b/src/accessor/grib_accessor_class_unpack_bufr_values.h
new file mode 100644
index 000000000..7890e7bad
--- /dev/null
+++ b/src/accessor/grib_accessor_class_unpack_bufr_values.h
@@ -0,0 +1,42 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_unpack_bufr_values_h
+#define eccodes_accessor_unpack_bufr_values_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_unpack_bufr_values_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in unpack_bufr_values */
+    grib_accessor* data_accessor;
+};
+
+class grib_accessor_class_unpack_bufr_values_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_unpack_bufr_values_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_unpack_bufr_values_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_double(grib_accessor*, const double* val, size_t* len) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    int unpack_string_array(grib_accessor*, char**, size_t* len) override;
+    int value_count(grib_accessor*, long*) override;
+    void destroy(grib_context*, grib_accessor*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_unpack_bufr_values_h */
diff --git a/src/accessor/grib_accessor_class_unsigned_bits.cc b/src/accessor/grib_accessor_class_unsigned_bits.cc
new file mode 100644
index 000000000..25d16fdc3
--- /dev/null
+++ b/src/accessor/grib_accessor_class_unsigned_bits.cc
@@ -0,0 +1,159 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_unsigned_bits.h"
+
+grib_accessor_class_unsigned_bits_t _grib_accessor_class_unsigned_bits{"unsigned_bits"};
+grib_accessor_class* grib_accessor_class_unsigned_bits = &_grib_accessor_class_unsigned_bits;
+
+
+
+static long compute_byte_count(grib_accessor* a){
+    grib_accessor_unsigned_bits_t* self = (grib_accessor_unsigned_bits_t*)a;
+    long numberOfBits;
+    long numberOfElements;
+    int ret = 0;
+
+    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfBits, &numberOfBits);
+    if (ret) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "%s unable to get %s to compute size", a->name, self->numberOfBits);
+        return 0;
+    }
+
+    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfElements, &numberOfElements);
+    if (ret) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "%s unable to get %s to compute size", a->name, self->numberOfElements);
+        return 0;
+    }
+
+    return (numberOfBits * numberOfElements + 7) / 8;
+}
+
+
+void grib_accessor_class_unsigned_bits_t::init(grib_accessor* a, const long len, grib_arguments* args){
+    grib_accessor_unsigned_bits_t* self = (grib_accessor_unsigned_bits_t*)a;
+    int n                             = 0;
+    self->numberOfBits                = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
+    self->numberOfElements            = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
+    a->length                         = compute_byte_count(a);
+}
+
+int grib_accessor_class_unsigned_bits_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_unsigned_bits_t* self = (grib_accessor_unsigned_bits_t*)a;
+    int ret                           = 0;
+    long pos                          = a->offset * 8;
+    long rlen                         = 0;
+    long numberOfBits                 = 0;
+
+    ret = value_count(a, &rlen);
+    if (ret)
+        return ret;
+
+    if (*len < rlen) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "Wrong size (%ld) for %s, it contains %ld values", *len, a->name, rlen);
+        *len = rlen;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfBits, &numberOfBits);
+    if (ret)
+        return ret;
+    if (numberOfBits == 0) {
+        int i;
+        for (i = 0; i < rlen; i++)
+            val[i] = 0;
+        return GRIB_SUCCESS;
+    }
+
+    grib_decode_long_array(grib_handle_of_accessor(a)->buffer->data, &pos, numberOfBits, rlen, val);
+
+    *len = rlen;
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_unsigned_bits_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_unsigned_bits_t* self = (grib_accessor_unsigned_bits_t*)a;
+    int ret                           = 0;
+    long off                          = 0;
+    long numberOfBits                 = 0;
+    size_t buflen                     = 0;
+    unsigned char* buf                = NULL;
+    unsigned long i                   = 0;
+    long rlen                         = 0;
+    ret                               = value_count(a, &rlen);
+    if (ret) return ret;
+
+    /*
+    if(*len < rlen)
+    {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+            "Wrong size for %s it contains %d values ", a->name , rlen );
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+     */
+    if (*len != rlen)
+        ret = grib_set_long(grib_handle_of_accessor(a), self->numberOfElements, *len);
+    if (ret) return ret;
+
+    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfBits, &numberOfBits);
+    if (ret) return ret;
+    if (numberOfBits == 0) {
+        grib_buffer_replace(a, NULL, 0, 1, 1);
+        return GRIB_SUCCESS;
+    }
+
+    buflen = compute_byte_count(a);
+    buf    = (unsigned char*)grib_context_malloc_clear(a->context, buflen + sizeof(long));
+
+    for (i = 0; i < *len; i++)
+        grib_encode_unsigned_longb(buf, val[i], &off, numberOfBits);
+
+    grib_buffer_replace(a, buf, buflen, 1, 1);
+
+    grib_context_free(a->context, buf);
+
+    return ret;
+}
+
+long grib_accessor_class_unsigned_bits_t::byte_count(grib_accessor* a){
+    return a->length;
+}
+
+int grib_accessor_class_unsigned_bits_t::value_count(grib_accessor* a, long* numberOfElements){
+    grib_accessor_unsigned_bits_t* self = (grib_accessor_unsigned_bits_t*)a;
+    int ret;
+    *numberOfElements = 0;
+
+    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfElements, numberOfElements);
+    if (ret) {
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "%s unable to get %s to compute size", a->name, self->numberOfElements);
+    }
+
+    return ret;
+}
+
+long grib_accessor_class_unsigned_bits_t::byte_offset(grib_accessor* a){
+    return a->offset;
+}
+
+void grib_accessor_class_unsigned_bits_t::update_size(grib_accessor* a, size_t s){
+    a->length = s;
+}
+
+long grib_accessor_class_unsigned_bits_t::next_offset(grib_accessor* a){
+    return byte_offset(a) + a->length;
+}
diff --git a/src/accessor/grib_accessor_class_unsigned_bits.h b/src/accessor/grib_accessor_class_unsigned_bits.h
new file mode 100644
index 000000000..62ae48e60
--- /dev/null
+++ b/src/accessor/grib_accessor_class_unsigned_bits.h
@@ -0,0 +1,40 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_unsigned_bits_h
+#define eccodes_accessor_unsigned_bits_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_unsigned_bits_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in unsigned_bits */
+    const char* numberOfBits;
+    const char* numberOfElements;
+};
+
+class grib_accessor_class_unsigned_bits_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_unsigned_bits_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_unsigned_bits_t{}; }
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    long byte_count(grib_accessor*) override;
+    long byte_offset(grib_accessor*) override;
+    long next_offset(grib_accessor*) override;
+    int value_count(grib_accessor*, long*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    void update_size(grib_accessor*, size_t) override;
+};
+#endif /* eccodes_accessor_unsigned_bits_h */
diff --git a/src/accessor/grib_accessor_class_validity_date.cc b/src/accessor/grib_accessor_class_validity_date.cc
new file mode 100644
index 000000000..5c250964d
--- /dev/null
+++ b/src/accessor/grib_accessor_class_validity_date.cc
@@ -0,0 +1,96 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_validity_date.h"
+#include "shared_functions.h"
+
+grib_accessor_class_validity_date_t _grib_accessor_class_validity_date{"validity_date"};
+grib_accessor_class* grib_accessor_class_validity_date = &_grib_accessor_class_validity_date;
+
+void grib_accessor_class_validity_date_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_validity_date_t* self = (grib_accessor_validity_date_t*)a;
+    grib_handle* hand                 = grib_handle_of_accessor(a);
+    int n                             = 0;
+
+    self->date      = grib_arguments_get_name(hand, c, n++);
+    self->time      = grib_arguments_get_name(hand, c, n++);
+    self->step      = grib_arguments_get_name(hand, c, n++);
+    self->stepUnits = grib_arguments_get_name(hand, c, n++);
+    self->year      = grib_arguments_get_name(hand, c, n++);
+    self->month     = grib_arguments_get_name(hand, c, n++);
+    self->day       = grib_arguments_get_name(hand, c, n++);
+
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+}
+
+int grib_accessor_class_validity_date_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_validity_date_t* self = (grib_accessor_validity_date_t*)a;
+    grib_handle* hand                 = grib_handle_of_accessor(a);
+    int ret                           = 0;
+    long date                         = 0;
+    long time                         = 0;
+    long step                         = 0;
+    long stepUnits                    = 0;
+    long hours = 0, minutes = 0, step_mins = 0, tmp, tmp_hrs;
+
+    if (self->year) {
+        long year, month, day;
+        if ((ret = grib_get_long_internal(hand, self->year, &year)) != GRIB_SUCCESS)
+            return ret;
+        if ((ret = grib_get_long_internal(hand, self->month, &month)) != GRIB_SUCCESS)
+            return ret;
+        if ((ret = grib_get_long_internal(hand, self->day, &day)) != GRIB_SUCCESS)
+            return ret;
+        *val = year * 10000 + month * 100 + day;
+        return GRIB_SUCCESS;
+    }
+    if ((ret = grib_get_long_internal(hand, self->date, &date)) != GRIB_SUCCESS)
+        return ret;
+    if ((ret = grib_get_long_internal(hand, self->time, &time)) != GRIB_SUCCESS)
+        return ret;
+    if ((ret = grib_get_long(hand, self->step, &step)) != GRIB_SUCCESS) {
+        if ((ret = grib_get_long_internal(hand, "endStep", &step)) != GRIB_SUCCESS) {
+            return ret; /* See ECC-817 */
+        }
+    }
+
+    if (self->stepUnits) {
+        if ((ret = grib_get_long_internal(hand, self->stepUnits, &stepUnits)) != GRIB_SUCCESS)
+            return ret;
+        step_mins = convert_to_minutes(step, stepUnits);
+    }
+
+    minutes = time % 100;
+    hours   = time / 100;
+    tmp     = minutes + step_mins; /* add the step to our minutes */
+    tmp_hrs = tmp / 60;            /* how many hours and mins is that? */
+    hours += tmp_hrs;              /* increment hours */
+
+    date = grib_date_to_julian(date);
+    /* does the new 'hours' exceed 24? if so increment julian */
+    while (hours >= 24) {
+        date++;
+        hours -= 24;
+    }
+    /* GRIB-29: Negative forecast time */
+    while (hours < 0) {
+        date--;
+        hours += 24;
+    }
+
+    if (*len < 1)
+        return GRIB_ARRAY_TOO_SMALL;
+
+    *val = grib_julian_to_date(date);
+
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_validity_date.h b/src/accessor/grib_accessor_class_validity_date.h
new file mode 100644
index 000000000..7a7eea971
--- /dev/null
+++ b/src/accessor/grib_accessor_class_validity_date.h
@@ -0,0 +1,39 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_validity_date_h
+#define eccodes_accessor_validity_date_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_validity_date_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in validity_date */
+    const char* date;
+    const char* time;
+    const char* step;
+    const char* stepUnits;
+    const char* year;
+    const char* month;
+    const char* day;
+};
+
+class grib_accessor_class_validity_date_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_validity_date_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_validity_date_t{}; }
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_validity_date_h */
diff --git a/src/accessor/grib_accessor_class_validity_time.cc b/src/accessor/grib_accessor_class_validity_time.cc
new file mode 100644
index 000000000..074bac88e
--- /dev/null
+++ b/src/accessor/grib_accessor_class_validity_time.cc
@@ -0,0 +1,116 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_validity_time.h"
+#include "shared_functions.h"
+
+grib_accessor_class_validity_time_t _grib_accessor_class_validity_time{"validity_time"};
+grib_accessor_class* grib_accessor_class_validity_time = &_grib_accessor_class_validity_time;
+
+
+void grib_accessor_class_validity_time_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_validity_time_t* self = (grib_accessor_validity_time_t*)a;
+    grib_handle* hand                 = grib_handle_of_accessor(a);
+    int n                             = 0;
+
+    self->date      = grib_arguments_get_name(hand, c, n++);
+    self->time      = grib_arguments_get_name(hand, c, n++);
+    self->step      = grib_arguments_get_name(hand, c, n++);
+    self->stepUnits = grib_arguments_get_name(hand, c, n++);
+    self->hours     = grib_arguments_get_name(hand, c, n++);
+    self->minutes   = grib_arguments_get_name(hand, c, n++);
+
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+}
+
+int grib_accessor_class_validity_time_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+    grib_accessor_validity_time_t* self = (grib_accessor_validity_time_t*)a;
+    grib_handle* hand                 = grib_handle_of_accessor(a);
+    int ret                           = 0;
+    long date                         = 0;
+    long time                         = 0;
+    long step                         = 0;
+    long stepUnits                    = 0;
+    long hours = 0, minutes = 0, step_mins = 0, tmp, tmp_hrs, tmp_mins;
+
+    if (self->hours) {
+        if ((ret = grib_get_long_internal(hand, self->hours, &hours)) != GRIB_SUCCESS)
+            return ret;
+        if ((ret = grib_get_long_internal(hand, self->minutes, &minutes)) != GRIB_SUCCESS)
+            return ret;
+        *val = hours * 100 + minutes;
+        return GRIB_SUCCESS;
+    }
+    if ((ret = grib_get_long_internal(hand, self->date, &date)) != GRIB_SUCCESS)
+        return ret;
+    if ((ret = grib_get_long_internal(hand, self->time, &time)) != GRIB_SUCCESS)
+        return ret;
+    if ((ret = grib_get_long(hand, self->step, &step)) != GRIB_SUCCESS) {
+        if ((ret = grib_get_long_internal(hand, "endStep", &step)) != GRIB_SUCCESS) {
+            return ret; /* See ECC-817 */
+        }
+    }
+
+    /* Seconds will always be zero. So convert to minutes */
+    if (self->stepUnits) {
+        if ((ret = grib_get_long_internal(hand, self->stepUnits, &stepUnits)) != GRIB_SUCCESS)
+            return ret;
+        step_mins = convert_to_minutes(step, stepUnits);
+    }
+
+    minutes  = time % 100;
+    hours    = time / 100;
+    tmp      = minutes + step_mins; /* add the step to our minutes */
+    tmp_hrs  = tmp / 60;            /* how many hours and mins is that? */
+    tmp_mins = tmp % 60;
+    hours += tmp_hrs; /* increment hours */
+    if (hours > 0) {
+        hours = hours % 24; /* wrap round if >= 24 */
+    }
+    else {
+        /* GRIB-29: Negative forecast time */
+        while (hours < 0) {
+            hours += 24;
+        }
+    }
+    time = hours * 100 + tmp_mins;
+
+    if (*len < 1)
+        return GRIB_ARRAY_TOO_SMALL;
+
+    *val = time;
+
+    return GRIB_SUCCESS;
+}
+
+int grib_accessor_class_validity_time_t::unpack_string(grib_accessor* a, char* val, size_t* len){
+    int err = 0;
+    long v  = 0;
+    size_t lsize = 1, lmin = 5;
+
+    err = unpack_long(a, &v, &lsize);
+    if (err) return err;
+
+    if (*len < lmin) {
+        const char* cclass_name = a->cclass->name;
+        grib_context_log(a->context, GRIB_LOG_ERROR,
+                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
+                         cclass_name, a->name, lmin, *len);
+        *len = lmin;
+        return GRIB_BUFFER_TOO_SMALL;
+    }
+
+    snprintf(val, 64, "%04ld", v);
+
+    len[0] = lmin;
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_validity_time.h b/src/accessor/grib_accessor_class_validity_time.h
new file mode 100644
index 000000000..7fe86648a
--- /dev/null
+++ b/src/accessor/grib_accessor_class_validity_time.h
@@ -0,0 +1,39 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_validity_time_h
+#define eccodes_accessor_validity_time_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_validity_time_t : public grib_accessor_long_t
+{
+public:
+    /* Members defined in validity_time */
+    const char* date;
+    const char* time;
+    const char* step;
+    const char* stepUnits;
+    const char* hours;
+    const char* minutes;
+};
+
+class grib_accessor_class_validity_time_t : public grib_accessor_class_long_t
+{
+public:
+    grib_accessor_class_validity_time_t(const char* name) : grib_accessor_class_long_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_validity_time_t{}; }
+    int unpack_long(grib_accessor*, long* val, size_t* len) override;
+    int unpack_string(grib_accessor*, char*, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_validity_time_h */
diff --git a/src/accessor/grib_accessor_class_values.cc b/src/accessor/grib_accessor_class_values.cc
new file mode 100644
index 000000000..e7009129c
--- /dev/null
+++ b/src/accessor/grib_accessor_class_values.cc
@@ -0,0 +1,139 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_values.h"
+
+grib_accessor_class_values_t _grib_accessor_class_values{"values"};
+grib_accessor_class* grib_accessor_class_values = &_grib_accessor_class_values;
+
+long init_length(grib_accessor* a){
+    grib_accessor_values_t* self = (grib_accessor_values_t*)a;
+    int ret                    = 0;
+
+    long seclen        = 0;
+    long offsetsection = 0;
+    long offsetdata    = 0;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->seclen, &seclen)))
+        return ret;
+
+    if (seclen == 0) {
+        /* printf("init_length seclen=0\n"); */
+        return 0;
+    }
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->offsetsection, &offsetsection)))
+        return ret;
+
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->offsetdata, &offsetdata)))
+        return ret;
+
+    /* When reparsing */
+    if (offsetdata < offsetsection) {
+        /* printf("init_length offsetdata < offsetsection=0\n"); */
+        Assert(grib_handle_of_accessor(a)->loader);
+        return 0;
+    }
+
+    return seclen - (offsetdata - offsetsection);
+}
+
+void grib_accessor_class_values_t::init(grib_accessor* a, const long v, grib_arguments* params){
+    grib_accessor_values_t* self = (grib_accessor_values_t*)a;
+    self->carg                 = 0;
+
+    self->seclen        = grib_arguments_get_name(grib_handle_of_accessor(a), params, self->carg++);
+    self->offsetdata    = grib_arguments_get_name(grib_handle_of_accessor(a), params, self->carg++);
+    self->offsetsection = grib_arguments_get_name(grib_handle_of_accessor(a), params, self->carg++);
+    self->dirty         = 1;
+
+    a->length = init_length(a);
+    /* Assert(a->length>=0); */
+}
+
+int grib_accessor_class_values_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_DOUBLE;
+}
+
+void grib_accessor_class_values_t::dump(grib_accessor* a, grib_dumper* dumper){
+    grib_dump_values(dumper, a);
+}
+
+long grib_accessor_class_values_t::byte_count(grib_accessor* a){
+    grib_context_log(a->context, GRIB_LOG_DEBUG, "byte_count of %s = %ld", a->name, a->length);
+    return a->length;
+}
+
+long grib_accessor_class_values_t::byte_offset(grib_accessor* a){
+    return a->offset;
+}
+
+long grib_accessor_class_values_t::next_offset(grib_accessor* a){
+    return a->offset + a->length;
+}
+
+void grib_accessor_class_values_t::update_size(grib_accessor* a, size_t s){
+    grib_context_log(a->context, GRIB_LOG_DEBUG, "updating size of %s old %ld new %ld", a->name, a->length, s);
+    a->length = s;
+    Assert(a->length >= 0);
+}
+
+int grib_accessor_class_values_t::compare(grib_accessor* a, grib_accessor* b){
+    int retval   = 0;
+    double* aval = 0;
+    double* bval = 0;
+
+    size_t alen = 0;
+    size_t blen = 0;
+    int err     = 0;
+    long count  = 0;
+
+    err = a->value_count(&count);    if (err)
+        return err;
+    alen = count;
+
+    err = b->value_count(&count);    if (err)
+        return err;
+    blen = count;
+
+    if (alen != blen)
+        return GRIB_COUNT_MISMATCH;
+
+    aval = (double*)grib_context_malloc(a->context, alen * sizeof(double));
+    bval = (double*)grib_context_malloc(b->context, blen * sizeof(double));
+
+    a->unpack_double(aval, &alen);    b->unpack_double(bval, &blen);
+    retval = GRIB_SUCCESS;
+    for (size_t i=0; i<alen && retval == GRIB_SUCCESS; ++i) {
+        if (aval[i] != bval[i]) retval = GRIB_DOUBLE_VALUE_MISMATCH;
+    }
+
+    grib_context_free(a->context, aval);
+    grib_context_free(b->context, bval);
+
+    return retval;
+}
+
+int grib_accessor_class_values_t::pack_long(grib_accessor* a, const long* val, size_t* len){
+    grib_accessor_values_t* self = (grib_accessor_values_t*)a;
+    double* dval = (double*)grib_context_malloc(a->context, *len * sizeof(double));
+
+    for (size_t i = 0; i < *len; i++)
+        dval[i] = (double)val[i];
+
+    int ret = a->pack_double(dval, len);
+    grib_context_free(a->context, dval);
+
+    self->dirty = 1;
+
+    return ret;
+}
diff --git a/src/accessor/grib_accessor_class_values.h b/src/accessor/grib_accessor_class_values.h
new file mode 100644
index 000000000..a77a5e89c
--- /dev/null
+++ b/src/accessor/grib_accessor_class_values.h
@@ -0,0 +1,44 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_values_h
+#define eccodes_accessor_values_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_values_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in values */
+    int  carg;
+    const char* seclen;
+    const char* offsetdata;
+    const char* offsetsection;
+    int dirty;
+};
+
+class grib_accessor_class_values_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_values_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_values_t{}; }
+    int get_native_type(grib_accessor*) override;
+    int pack_long(grib_accessor*, const long* val, size_t* len) override;
+    long byte_count(grib_accessor*) override;
+    long byte_offset(grib_accessor*) override;
+    long next_offset(grib_accessor*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    void update_size(grib_accessor*, size_t) override;
+    int compare(grib_accessor*, grib_accessor*) override;
+};
+#endif /* eccodes_accessor_values_h */
diff --git a/src/accessor/grib_accessor_class_vector.cc b/src/accessor/grib_accessor_class_vector.cc
new file mode 100644
index 000000000..e48ab1aaf
--- /dev/null
+++ b/src/accessor/grib_accessor_class_vector.cc
@@ -0,0 +1,57 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_vector.h"
+#include "grib_accessor_class_abstract_vector.h"
+
+grib_accessor_class_vector_t _grib_accessor_class_vector{"vector"};
+grib_accessor_class* grib_accessor_class_vector = &_grib_accessor_class_vector;
+
+
+void grib_accessor_class_vector_t::init(grib_accessor* a, const long l, grib_arguments* c){
+    grib_accessor_vector_t* self = (grib_accessor_vector_t*)a;
+    int n                      = 0;
+
+    self->vector = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
+    self->index  = grib_arguments_get_long(grib_handle_of_accessor(a), c, n++);
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
+    a->length = 0;
+}
+
+int grib_accessor_class_vector_t::unpack_double(grib_accessor* a, double* val, size_t* len){
+    int err     = 0;
+    size_t size = 0;
+    double* stat;
+    grib_accessor_vector_t* self       = (grib_accessor_vector_t*)a;
+    grib_accessor* va                = (grib_accessor*)grib_find_accessor(grib_handle_of_accessor(a), self->vector);
+    grib_accessor_abstract_vector_t* v = (grib_accessor_abstract_vector_t*)va;
+
+    Assert(self->index >= 0);
+
+    if (self->index >= v->number_of_elements) {
+        grib_context_log(a->context, GRIB_LOG_FATAL, "index=%d number_of_elements=%d for %s", self->index, v->number_of_elements, a->name);
+        Assert(self->index < v->number_of_elements);
+    }
+
+    if (va->dirty) {
+        grib_get_size(grib_handle_of_accessor(a), self->vector, &size);
+        stat = (double*)grib_context_malloc_clear(a->context, sizeof(double) * size);
+        err  = va->unpack_double(stat, &size);        grib_context_free(a->context, stat);
+        if (err)
+            return err;
+    }
+
+    *val = v->v[self->index];
+
+    return err;
+}
diff --git a/src/accessor/grib_accessor_class_vector.h b/src/accessor/grib_accessor_class_vector.h
new file mode 100644
index 000000000..df12303cd
--- /dev/null
+++ b/src/accessor/grib_accessor_class_vector.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_vector_h
+#define eccodes_accessor_vector_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_abstract_vector.h"
+
+class grib_accessor_vector_t : public grib_accessor_abstract_vector_t
+{
+public:
+    /* Members defined in vector */
+    const char* vector;
+    int index;
+};
+
+class grib_accessor_class_vector_t : public grib_accessor_class_abstract_vector_t
+{
+public:
+    grib_accessor_class_vector_t(const char* name) : grib_accessor_class_abstract_vector_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_vector_t{}; }
+    int unpack_double(grib_accessor*, double* val, size_t* len) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+};
+#endif /* eccodes_accessor_vector_h */
diff --git a/src/accessor/grib_accessor_class_when.cc b/src/accessor/grib_accessor_class_when.cc
new file mode 100644
index 000000000..0834d0f86
--- /dev/null
+++ b/src/accessor/grib_accessor_class_when.cc
@@ -0,0 +1,35 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+#include "grib_accessor_class_when.h"
+
+grib_accessor_class_when_t _grib_accessor_class_when{"when"};
+grib_accessor_class* grib_accessor_class_when = &_grib_accessor_class_when;
+
+
+void grib_accessor_class_when_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+    a->length = 0;
+    a->flags |= GRIB_ACCESSOR_FLAG_HIDDEN;
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+}
+
+void grib_accessor_class_when_t::dump(grib_accessor* a, grib_dumper* dumper){
+    /* grib_dump_when(dumper,a,NULL); */
+}
+
+int grib_accessor_class_when_t::notify_change(grib_accessor* a, grib_accessor* changed){
+    return grib_action_notify_change(a->creator, a, changed);
+}
+
+int grib_accessor_class_when_t::get_native_type(grib_accessor* a){
+    return GRIB_TYPE_UNDEFINED;
+}
diff --git a/src/accessor/grib_accessor_class_when.h b/src/accessor/grib_accessor_class_when.h
new file mode 100644
index 000000000..69f1dffbb
--- /dev/null
+++ b/src/accessor/grib_accessor_class_when.h
@@ -0,0 +1,34 @@
+
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#ifndef eccodes_accessor_when_h
+#define eccodes_accessor_when_h
+
+#include "../grib_api_internal.h"
+#include "grib_accessor_class_gen.h"
+
+class grib_accessor_when_t : public grib_accessor_gen_t
+{
+public:
+    /* Members defined in when */
+};
+
+class grib_accessor_class_when_t : public grib_accessor_class_gen_t
+{
+public:
+    grib_accessor_class_when_t(const char* name) : grib_accessor_class_gen_t(name) {}
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_when_t{}; }
+    int get_native_type(grib_accessor*) override;
+    void dump(grib_accessor*, grib_dumper*) override;
+    void init(grib_accessor*, const long, grib_arguments*) override;
+    int notify_change(grib_accessor*, grib_accessor*) override;
+};
+#endif /* eccodes_accessor_when_h */
diff --git a/src/accessor/todo/grib_accessor_class_abstract_long_vector.cc b/src/accessor/todo/grib_accessor_class_abstract_long_vector.cc
deleted file mode 100644
index 523e0a740..000000000
--- a/src/accessor/todo/grib_accessor_class_abstract_long_vector.cc
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/******************************************************************
- *  Enrico Fucile
- ******************************************************************/
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   MEMBERS = long* v
-   MEMBERS = long pack_index
-   MEMBERS = int number_of_elements
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-
-typedef struct grib_accessor_abstract_long_vector
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in abstract_long_vector */
-    long* v;
-    long pack_index;
-    int number_of_elements;
-} grib_accessor_abstract_long_vector;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_abstract_long_vector = {
-    &grib_accessor_class_gen,                      /* super */
-    "abstract_long_vector",                      /* name */
-    sizeof(grib_accessor_abstract_long_vector),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    0,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_abstract_long_vector = &_grib_accessor_class_abstract_long_vector;
-
-/* END_CLASS_IMP */
diff --git a/src/accessor/todo/grib_accessor_class_abstract_vector.cc b/src/accessor/todo/grib_accessor_class_abstract_vector.cc
deleted file mode 100644
index 1353aeffc..000000000
--- a/src/accessor/todo/grib_accessor_class_abstract_vector.cc
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_double
-   MEMBERS = double* v
-   MEMBERS = int number_of_elements
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-
-typedef struct grib_accessor_abstract_vector
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in abstract_vector */
-    double* v;
-    int number_of_elements;
-} grib_accessor_abstract_vector;
-
-extern grib_accessor_class* grib_accessor_class_double;
-
-static grib_accessor_class _grib_accessor_class_abstract_vector = {
-    &grib_accessor_class_double,                      /* super */
-    "abstract_vector",                      /* name */
-    sizeof(grib_accessor_abstract_vector),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    0,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_abstract_vector = &_grib_accessor_class_abstract_vector;
-
-/* END_CLASS_IMP */
diff --git a/src/accessor/todo/grib_accessor_class_ascii.cc b/src/accessor/todo/grib_accessor_class_ascii.cc
deleted file mode 100644
index b0c90182e..000000000
--- a/src/accessor/todo/grib_accessor_class_ascii.cc
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-/***********************************************************
- *  Enrico Fucile
- ***********************************************************/
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = unpack_string;pack_string
-   IMPLEMENTS = unpack_long;pack_long
-   IMPLEMENTS = unpack_double;pack_double
-   IMPLEMENTS = init;dump;string_length
-   IMPLEMENTS = value_count
-   IMPLEMENTS = get_native_type
-   IMPLEMENTS = compare
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int pack_string(grib_accessor*, const char*, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static size_t string_length(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static int compare(grib_accessor*, grib_accessor*);
-
-typedef struct grib_accessor_ascii
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in ascii */
-} grib_accessor_ascii;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_ascii = {
-    &grib_accessor_class_gen,                      /* super */
-    "ascii",                      /* name */
-    sizeof(grib_accessor_ascii),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    &string_length,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    &pack_string,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    &compare,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_ascii = &_grib_accessor_class_ascii;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    a->length = len;
-    Assert(a->length >= 0);
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    *count = 1;
-    return 0;
-}
-
-static size_t string_length(grib_accessor* a)
-{
-    return a->length;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    grib_dump_string(dumper, a, NULL);
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_STRING;
-}
-
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    size_t i = 0;
-    grib_handle* hand = grib_handle_of_accessor(a);
-    const size_t alen = a->length;
-
-    if (*len < (alen + 1)) {
-        const char* cclass_name = a->cclass->name;
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
-                         cclass_name, a->name, alen+1, *len);
-        *len = alen + 1;
-        return GRIB_BUFFER_TOO_SMALL;
-    }
-
-    for (i = 0; i < alen; i++)
-        val[i] = hand->buffer->data[a->offset + i];
-    val[i] = 0;
-    *len = i;
-    return GRIB_SUCCESS;
-}
-
-static int pack_string(grib_accessor* a, const char* val, size_t* len)
-{
-    size_t i = 0;
-    grib_handle* hand = grib_handle_of_accessor(a);
-    const size_t alen = a->length;
-    if (len[0] > (alen + 1)) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                "pack_string: Wrong size (%zu) for %s, it contains %ld values", len[0], a->name, a->length + 1);
-        len[0] = 0;
-        return GRIB_BUFFER_TOO_SMALL;
-    }
-
-    for (i = 0; i < alen; i++) {
-        if (i < len[0])
-            hand->buffer->data[a->offset + i] = val[i];
-        else
-            hand->buffer->data[a->offset + i] = 0;
-    }
-
-    return GRIB_SUCCESS;
-}
-
-static int pack_long(grib_accessor* a, const long* v, size_t* len)
-{
-    grib_context_log(a->context, GRIB_LOG_ERROR, "Should not pack %s as long (It's a string)", a->name);
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static int pack_double(grib_accessor* a, const double* v, size_t* len)
-{
-    grib_context_log(a->context, GRIB_LOG_ERROR, "Should not pack %s as double (It's a string)", a->name);
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static int unpack_long(grib_accessor* a, long* v, size_t* len)
-{
-    char val[1024] = {0,};
-    size_t l   = sizeof(val);
-    size_t i   = 0;
-    char* last = NULL;
-    int err    = grib_unpack_string(a, val, &l);
-
-    if (err)
-        return err;
-
-    i = 0;
-    while (i < l - 1 && val[i] == ' ')
-        i++;
-
-    if (val[i] == 0) {
-        *v = 0;
-        return 0;
-    }
-    if (val[i + 1] == ' ' && i < l - 2)
-        val[i + 1] = 0;
-
-    *v = strtol(val, &last, 10);
-
-    grib_context_log(a->context, GRIB_LOG_DEBUG, " Casting string %s to long", a->name);
-    return GRIB_SUCCESS;
-}
-
-static int unpack_double(grib_accessor* a, double* v, size_t* len)
-{
-    char val[1024];
-    size_t l   = sizeof(val);
-    char* last = NULL;
-
-    int err = grib_unpack_string(a, val, &l);
-    if (err) return err;
-
-    *v = strtod(val, &last);
-
-    if (*last == 0) {
-        grib_context_log(a->context, GRIB_LOG_DEBUG, " Casting string %s to long", a->name);
-        return GRIB_SUCCESS;
-    }
-
-    grib_context_log(a->context, GRIB_LOG_WARNING, "Cannot unpack %s as double. Hint: Try unpacking as string", a->name);
-
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static int compare(grib_accessor* a, grib_accessor* b)
-{
-    int retval = 0;
-    char* aval = 0;
-    char* bval = 0;
-    int err    = 0;
-
-    size_t alen = a->length+1;
-    size_t blen = b->length+1;
-
-    if (alen != blen)
-        return GRIB_COUNT_MISMATCH;
-
-    aval = (char*)grib_context_malloc(a->context, alen * sizeof(char));
-    bval = (char*)grib_context_malloc(b->context, blen * sizeof(char));
-
-    err = grib_unpack_string(a, aval, &alen);
-    if (err) return err;
-    err = grib_unpack_string(b, bval, &blen);
-    if (err) return err;
-
-    retval = GRIB_SUCCESS;
-    if (!STR_EQUAL(aval, bval))
-        retval = GRIB_STRING_VALUE_MISMATCH;
-
-    grib_context_free(a->context, aval);
-    grib_context_free(b->context, bval);
-
-    return retval;
-}
diff --git a/src/accessor/todo/grib_accessor_class_bit.cc b/src/accessor/todo/grib_accessor_class_bit.cc
deleted file mode 100644
index ab81eecda..000000000
--- a/src/accessor/todo/grib_accessor_class_bit.cc
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long;pack_long
-   IMPLEMENTS = init
-   MEMBERS    = const char* owner
-   MEMBERS    = int bit_index
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_bit
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in bit */
-    const char* owner;
-    int bit_index;
-} grib_accessor_bit;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_bit = {
-    &grib_accessor_class_long,                      /* super */
-    "bit",                      /* name */
-    sizeof(grib_accessor_bit),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_bit = &_grib_accessor_class_bit;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    grib_accessor_bit* self = (grib_accessor_bit*)a;
-    a->length       = 0;
-    self->owner     = grib_arguments_get_name(grib_handle_of_accessor(a), arg, 0);
-    self->bit_index = grib_arguments_get_long(grib_handle_of_accessor(a), arg, 1);
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_bit* self = (grib_accessor_bit*)a;
-    int ret = 0;
-    long data = 0;
-
-    if (*len < 1) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "grib_accessor_bit: unpack_long: Wrong size for %s, it contains %d values ", a->name, 1);
-        *len = 1;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->owner, &data)) != GRIB_SUCCESS) {
-        *len = 0;
-        return ret;
-    }
-
-    if (data & (1 << self->bit_index))
-        *val = 1;
-    else
-        *val = 0;
-
-    *len = 1;
-    return GRIB_SUCCESS;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_bit* self = (grib_accessor_bit*)a;
-
-    if (*len < 1) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "grib_accessor_bit: pack_long: At least one value to pack for %s", a->name);
-        *len = 1;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    grib_accessor* owner = grib_find_accessor(grib_handle_of_accessor(a), self->owner);
-    if (!owner) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "grib_accessor_bit: Cannot get the owner %s for computing the bit value of %s",
-                        self->owner, a->name);
-        *len = 0;
-        return GRIB_NOT_FOUND;
-    }
-
-    unsigned char* mdata = grib_handle_of_accessor(a)->buffer->data;
-    mdata += grib_byte_offset(owner);
-
-    /* Note: In the definitions, flagbit numbers go from 7 to 0 (the bit_index), while WMO convention is from 1 to 8 */
-    if (a->context->debug) {
-        /* Print bit positions from 1 (MSB) */
-        fprintf(stderr, "ECCODES DEBUG Setting bit %d in %s to %d\n", 8 - self->bit_index, owner->name, (*val > 0) );
-    }
-    grib_set_bit(mdata, 7 - self->bit_index, *val > 0);
-
-    *len = 1;
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_bitmap.cc b/src/accessor/todo/grib_accessor_class_bitmap.cc
deleted file mode 100644
index b86b34332..000000000
--- a/src/accessor/todo/grib_accessor_class_bitmap.cc
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-#include <type_traits>
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_bytes
-   IMPLEMENTS = next_offset
-   IMPLEMENTS = unpack_double;unpack_double_element;unpack_double_element_set
-   IMPLEMENTS = unpack_float
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = unpack_string
-   IMPLEMENTS = string_length
-   IMPLEMENTS = init;dump;update_size
-   MEMBERS=const char* tableReference
-   MEMBERS=const char* missing_value
-   MEMBERS=const char* offsetbsec
-   MEMBERS=const char* sLength
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_float(grib_accessor*, float* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static size_t string_length(grib_accessor*);
-static long next_offset(grib_accessor*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static void update_size(grib_accessor*, size_t);
-static int unpack_double_element(grib_accessor*, size_t i, double* val);
-static int unpack_double_element_set(grib_accessor*, const size_t* index_array, size_t len, double* val_array);
-
-typedef struct grib_accessor_bitmap
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in bytes */
-    /* Members defined in bitmap */
-    const char* tableReference;
-    const char* missing_value;
-    const char* offsetbsec;
-    const char* sLength;
-} grib_accessor_bitmap;
-
-extern grib_accessor_class* grib_accessor_class_bytes;
-
-static grib_accessor_class _grib_accessor_class_bitmap = {
-    &grib_accessor_class_bytes,                      /* super */
-    "bitmap",                      /* name */
-    sizeof(grib_accessor_bitmap),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    &next_offset,                /* next_offset */
-    &string_length,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    &unpack_float,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    &update_size,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    &unpack_double_element,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    &unpack_double_element_set,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_bitmap = &_grib_accessor_class_bitmap;
-
-/* END_CLASS_IMP */
-
-
-static void compute_size(grib_accessor* a)
-{
-    long slen         = 0;
-    long off          = 0;
-    grib_handle* hand = grib_handle_of_accessor(a);
-
-    grib_accessor_bitmap* self = (grib_accessor_bitmap*)a;
-    grib_get_long_internal(hand, self->offsetbsec, &off);
-    grib_get_long_internal(hand, self->sLength, &slen);
-
-    if (slen == 0) {
-        grib_accessor* seclen;
-        size_t size;
-        /* Assume reparsing */
-        Assert(hand->loader != 0);
-        if (hand->loader != 0) {
-            seclen = grib_find_accessor(hand, self->sLength);
-            Assert(seclen);
-            grib_get_block_length(seclen->parent, &size);
-            slen = size;
-        }
-    }
-
-    // printf("compute_size off=%ld slen=%ld a->offset=%ld\n", (long)off,(long)slen,(long)a->offset);
-
-    a->length = off + (slen - a->offset);
-
-    if (a->length < 0) {
-        /* Assume reparsing */
-        /*Assert(hand->loader != 0);*/
-        a->length = 0;
-    }
-
-    Assert(a->length >= 0);
-}
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    grib_accessor_bitmap* self = (grib_accessor_bitmap*)a;
-    grib_handle* hand = grib_handle_of_accessor(a);
-    int n = 0;
-
-    self->tableReference = grib_arguments_get_name(hand, arg, n++);
-    self->missing_value  = grib_arguments_get_name(hand, arg, n++);
-    self->offsetbsec     = grib_arguments_get_name(hand, arg, n++);
-    self->sLength        = grib_arguments_get_name(hand, arg, n++);
-
-    compute_size(a);
-}
-
-static long next_offset(grib_accessor* a)
-{
-    return grib_byte_offset(a) + grib_byte_count(a);
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    long len = 0;
-    char label[1024];
-
-    grib_value_count(a, &len);
-
-    snprintf(label, 1024, "Bitmap of %ld values", len);
-    grib_dump_bytes(dumper, a, label);
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    long pos  = a->offset * 8;
-    long tlen = 0;
-    const grib_handle* hand = grib_handle_of_accessor(a);
-
-    int err = grib_value_count(a, &tlen);
-    if (err)
-        return err;
-
-    if (*len < tlen) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s, it contains %ld values", a->name, tlen);
-        *len = tlen;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    for (long i = 0; i < tlen; i++) {
-        val[i] = (long)grib_decode_unsigned_long(hand->buffer->data, &pos, 1);
-    }
-    *len = tlen;
-    return GRIB_SUCCESS;
-}
-
-template <typename T>
-static int unpack(grib_accessor* a, T* val, size_t* len)
-{
-    static_assert(std::is_floating_point<T>::value, "Requires floating points numbers");
-    long pos = a->offset * 8;
-    long tlen;
-    grib_handle* hand = grib_handle_of_accessor(a);
-
-    int err = grib_value_count(a, &tlen);
-    if (err)
-        return err;
-
-    if (*len < tlen) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s, it contains %ld values", a->name, tlen);
-        *len = tlen;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    for (long i = 0; i < tlen; i++) {
-        val[i] = (T)grib_decode_unsigned_long(hand->buffer->data, &pos, 1);
-    }
-    *len = tlen;
-    return GRIB_SUCCESS;
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    return unpack<double>(a, val, len);
-}
-
-static int unpack_float(grib_accessor* a, float* val, size_t* len)
-{
-    return unpack<float>(a, val, len);
-}
-
-static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
-{
-    long pos = a->offset * 8;
-
-    pos += idx;
-    *val = (double)grib_decode_unsigned_long(grib_handle_of_accessor(a)->buffer->data, &pos, 1);
-
-    return GRIB_SUCCESS;
-}
-static int unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array)
-{
-    for (size_t i=0; i<len; ++i) {
-        unpack_double_element(a, index_array[i], val_array + i);
-    }
-    return GRIB_SUCCESS;
-}
-
-static void update_size(grib_accessor* a, size_t s)
-{
-    a->length = s;
-}
-
-static size_t string_length(grib_accessor* a)
-{
-    return a->length;
-}
-
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    grib_handle* hand = grib_handle_of_accessor(a);
-    const size_t l = a->length;
-
-    if (*len < l) {
-        const char* cclass_name = a->cclass->name;
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
-                         cclass_name, a->name, l, *len);
-        *len = l;
-        return GRIB_BUFFER_TOO_SMALL;
-    }
-
-    for (long i = 0; i < a->length; i++) {
-        val[i] = hand->buffer->data[a->offset + i];
-    }
-
-    *len = a->length;
-
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_bits_per_value.cc b/src/accessor/todo/grib_accessor_class_bits_per_value.cc
deleted file mode 100644
index 5648a9a69..000000000
--- a/src/accessor/todo/grib_accessor_class_bits_per_value.cc
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/**********************************
- *  Enrico Fucile
- *********************************/
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long; pack_long
-   IMPLEMENTS = init
-   MEMBERS = const char* values
-   MEMBERS = const char* bits_per_value
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_bits_per_value
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in bits_per_value */
-    const char* values;
-    const char* bits_per_value;
-} grib_accessor_bits_per_value;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_bits_per_value = {
-    &grib_accessor_class_long,                      /* super */
-    "bits_per_value",                      /* name */
-    sizeof(grib_accessor_bits_per_value),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_bits_per_value = &_grib_accessor_class_bits_per_value;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* args)
-{
-    int n                              = 0;
-    grib_accessor_bits_per_value* self = (grib_accessor_bits_per_value*)a;
-    self->values                       = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
-    self->bits_per_value               = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
-    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
-    a->length = 0;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    int ret                            = 0;
-    grib_accessor_bits_per_value* self = (grib_accessor_bits_per_value*)a;
-    grib_handle* h                     = grib_handle_of_accessor(a);
-
-    if ((ret = grib_get_long_internal(h, self->bits_per_value, val)) != GRIB_SUCCESS)
-        return ret;
-
-    *len = 1;
-    return ret;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    double* values                     = NULL;
-    size_t size                        = 0;
-    int ret                            = 0;
-    grib_accessor_bits_per_value* self = (grib_accessor_bits_per_value*)a;
-    grib_context* c                    = a->context;
-    grib_handle* h                     = grib_handle_of_accessor(a);
-
-    if ((ret = grib_get_size(h, self->values, &size)) != GRIB_SUCCESS)
-        return ret;
-
-    values = (double*)grib_context_malloc(c, size * sizeof(double));
-    if (!values)
-        return GRIB_OUT_OF_MEMORY;
-
-    if ((ret = grib_get_double_array_internal(h, self->values, values, &size)) != GRIB_SUCCESS) {
-        grib_context_free(c, values);
-        return ret;
-    }
-
-    if ((ret = grib_set_long_internal(h, self->bits_per_value, *val)) != GRIB_SUCCESS) {
-        grib_context_free(c, values);
-        return ret;
-    }
-
-    if ((ret = grib_set_double_array_internal(h, self->values, values, size)) != GRIB_SUCCESS) {
-        grib_context_free(c, values);
-        return ret;
-    }
-
-    grib_context_free(c, values);
-
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_blob.cc b/src/accessor/todo/grib_accessor_class_blob.cc
deleted file mode 100644
index 7e1c1de62..000000000
--- a/src/accessor/todo/grib_accessor_class_blob.cc
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = get_native_type;init
-   IMPLEMENTS = unpack_bytes;dump
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_bytes(grib_accessor*, unsigned char*, size_t* len);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_blob
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in blob */
-} grib_accessor_blob;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_blob = {
-    &grib_accessor_class_gen,                      /* super */
-    "blob",                      /* name */
-    sizeof(grib_accessor_blob),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    &unpack_bytes,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_blob = &_grib_accessor_class_blob;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    grib_get_long_internal(grib_handle_of_accessor(a), grib_arguments_get_name(a->parent->h, arg, 0), &a->length);
-    Assert(a->length >= 0);
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_BYTES;
-}
-
-static int unpack_bytes(grib_accessor* a, unsigned char* buffer, size_t* len)
-{
-    if (*len < (size_t)a->length) {
-        *len = a->length;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-    *len = a->length;
-
-    memcpy(buffer, grib_handle_of_accessor(a)->buffer->data + a->offset, *len);
-
-    return GRIB_SUCCESS;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    grib_dump_bytes(dumper, a, NULL);
-}
diff --git a/src/accessor/todo/grib_accessor_class_budgdate.cc b/src/accessor/todo/grib_accessor_class_budgdate.cc
deleted file mode 100644
index 15fc9b4bd..000000000
--- a/src/accessor/todo/grib_accessor_class_budgdate.cc
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long;pack_long
-   IMPLEMENTS = init
-   MEMBERS=const char* year
-   MEMBERS=const char* month
-   MEMBERS=const char* day
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_budgdate
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in budgdate */
-    const char* year;
-    const char* month;
-    const char* day;
-} grib_accessor_budgdate;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_budgdate = {
-    &grib_accessor_class_long,                      /* super */
-    "budgdate",                      /* name */
-    sizeof(grib_accessor_budgdate),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_budgdate = &_grib_accessor_class_budgdate;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_budgdate* self = (grib_accessor_budgdate*)a;
-    int n                        = 0;
-
-    self->year  = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->month = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->day   = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    int ret                      = 0;
-    grib_accessor_budgdate* self = (grib_accessor_budgdate*)a;
-
-    long year  = 0;
-    long month = 0;
-    long day   = 0;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->day, &day)) != GRIB_SUCCESS)
-        return ret;
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->month, &month)) != GRIB_SUCCESS)
-        return ret;
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->year, &year)) != GRIB_SUCCESS)
-        return ret;
-
-    if (*len < 1)
-        return GRIB_WRONG_ARRAY_SIZE;
-
-    val[0] = (1900 + year) * 10000 + month * 100 + day;
-
-    return ret;
-}
-
-/* TODO: Check for a valid date */
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    int ret                      = 0;
-    long v                       = val[0];
-    grib_accessor_budgdate* self = (grib_accessor_budgdate*)a;
-
-    long year  = 0;
-    long month = 0;
-    long day   = 0;
-
-    if (*len != 1)
-        return GRIB_WRONG_ARRAY_SIZE;
-
-    year = v / 10000;
-    v %= 10000;
-    month = v / 100;
-    v %= 100;
-    day = v;
-
-    year -= 1900;
-
-    Assert(year < 255);
-
-    if ((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->day, day)) != GRIB_SUCCESS)
-        return ret;
-    if ((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->month, month)) != GRIB_SUCCESS)
-        return ret;
-    if ((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->year, year)) != GRIB_SUCCESS)
-        return ret;
-
-    return ret;
-}
diff --git a/src/accessor/todo/grib_accessor_class_bufr_extract_subsets.cc b/src/accessor/todo/grib_accessor_class_bufr_extract_subsets.cc
deleted file mode 100644
index 567ceb61a..000000000
--- a/src/accessor/todo/grib_accessor_class_bufr_extract_subsets.cc
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = init; get_native_type
-   IMPLEMENTS = pack_long;
-   MEMBERS    = const char* numericValues
-   MEMBERS    = const char* pack
-   MEMBERS    = grib_accessor* numericValuesAccessor
-   MEMBERS    = grib_accessor* packAccessor
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_bufr_extract_subsets
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in bufr_extract_subsets */
-    const char* numericValues;
-    const char* pack;
-    grib_accessor* numericValuesAccessor;
-    grib_accessor* packAccessor;
-} grib_accessor_bufr_extract_subsets;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_bufr_extract_subsets = {
-    &grib_accessor_class_gen,                      /* super */
-    "bufr_extract_subsets",                      /* name */
-    sizeof(grib_accessor_bufr_extract_subsets),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_bufr_extract_subsets = &_grib_accessor_class_bufr_extract_subsets;
-
-/* END_CLASS_IMP */
-
-static void get_accessors(grib_accessor* a)
-{
-    grib_accessor_bufr_extract_subsets* self = (grib_accessor_bufr_extract_subsets*)a;
-    const grib_handle* h = grib_handle_of_accessor(a);
-
-    if (self->packAccessor)
-        return;
-    self->numericValuesAccessor = grib_find_accessor(h, self->numericValues);
-    self->packAccessor          = grib_find_accessor(h, self->pack);
-}
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    int n = 0;
-    grib_accessor_bufr_extract_subsets* self = (grib_accessor_bufr_extract_subsets*)a;
-
-    a->length           = 0;
-    self->numericValues = grib_arguments_get_name(grib_handle_of_accessor(a), arg, n++);
-    self->pack          = grib_arguments_get_name(grib_handle_of_accessor(a), arg, n++);
-    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_LONG;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_bufr_extract_subsets* self = (grib_accessor_bufr_extract_subsets*)a;
-    size_t l = 1;
-    long v[1];
-
-    get_accessors(a);
-
-    v[0] = 1;
-    int err  = grib_pack_long(self->packAccessor, v, &l);
-    if (err) {
-        if (err == GRIB_ENCODING_ERROR)
-            grib_context_log(a->context, GRIB_LOG_ERROR, "Could not extract subset(s).\n\tHint: Did you forget to set unpack=1?");
-        return err;
-    }
-
-    return err;
-}
diff --git a/src/accessor/todo/grib_accessor_class_bufr_group.cc b/src/accessor/todo/grib_accessor_class_bufr_group.cc
deleted file mode 100644
index 9af0a5633..000000000
--- a/src/accessor/todo/grib_accessor_class_bufr_group.cc
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_variable
-   IMPLEMENTS = dump;next
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static void dump(grib_accessor*, grib_dumper*);
-static grib_accessor* next(grib_accessor*, int);
-
-typedef struct grib_accessor_bufr_group
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in variable */
-    double dval;
-    float  fval;
-    char*  cval;
-    char*  cname;
-    int    type;
-    /* Members defined in bufr_group */
-} grib_accessor_bufr_group;
-
-extern grib_accessor_class* grib_accessor_class_variable;
-
-static grib_accessor_class _grib_accessor_class_bufr_group = {
-    &grib_accessor_class_variable,                      /* super */
-    "bufr_group",                      /* name */
-    sizeof(grib_accessor_bufr_group),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    0,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    &next,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_bufr_group = &_grib_accessor_class_bufr_group;
-
-/* END_CLASS_IMP */
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    grib_dump_section(dumper, a, a->sub_section->block);
-}
-
-static grib_accessor* next(grib_accessor* a, int explore)
-{
-    grib_accessor* next = NULL;
-    if (explore) {
-        next = a->sub_section->block->first;
-        if (!next)
-            next = a->next;
-    }
-    else {
-        next = a->next;
-    }
-    if (!next) {
-        if (a->parent->owner)
-            next = a->parent->owner->cclass->next(a->parent->owner, 0);
-    }
-    return next;
-}
diff --git a/src/accessor/todo/grib_accessor_class_bufr_simple_thinning.cc b/src/accessor/todo/grib_accessor_class_bufr_simple_thinning.cc
deleted file mode 100644
index cd0181fe4..000000000
--- a/src/accessor/todo/grib_accessor_class_bufr_simple_thinning.cc
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = init; get_native_type
-   IMPLEMENTS = pack_long;
-   MEMBERS    = const char* doExtractSubsets
-   MEMBERS    = const char* numberOfSubsets
-   MEMBERS    = const char* extractSubsetList
-   MEMBERS    = const char* simpleThinningStart
-   MEMBERS    = const char* simpleThinningMissingRadius
-   MEMBERS    = const char* simpleThinningSkip
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_bufr_simple_thinning
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in bufr_simple_thinning */
-    const char* doExtractSubsets;
-    const char* numberOfSubsets;
-    const char* extractSubsetList;
-    const char* simpleThinningStart;
-    const char* simpleThinningMissingRadius;
-    const char* simpleThinningSkip;
-} grib_accessor_bufr_simple_thinning;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_bufr_simple_thinning = {
-    &grib_accessor_class_gen,                      /* super */
-    "bufr_simple_thinning",                      /* name */
-    sizeof(grib_accessor_bufr_simple_thinning),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_bufr_simple_thinning = &_grib_accessor_class_bufr_simple_thinning;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    grib_accessor_bufr_simple_thinning* self = (grib_accessor_bufr_simple_thinning*)a;
-    grib_handle* h = grib_handle_of_accessor(a);
-    int n = 0;
-
-    a->length                         = 0;
-    self->doExtractSubsets            = grib_arguments_get_name(h, arg, n++);
-    self->numberOfSubsets             = grib_arguments_get_name(h, arg, n++);
-    self->extractSubsetList           = grib_arguments_get_name(h, arg, n++);
-    self->simpleThinningStart         = grib_arguments_get_name(h, arg, n++);
-    self->simpleThinningMissingRadius = grib_arguments_get_name(h, arg, n++);
-    self->simpleThinningSkip          = grib_arguments_get_name(h, arg, n++);
-
-    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_LONG;
-}
-
-static int apply_thinning(grib_accessor* a)
-{
-    const grib_accessor_bufr_simple_thinning* self = (grib_accessor_bufr_simple_thinning*)a;
-
-    long skip;
-    grib_handle* h  = grib_handle_of_accessor(a);
-    grib_context* c = h->context;
-    long compressed = 0, nsubsets;
-    grib_iarray* subsets;
-    long* subsets_ar = 0;
-    long start = 0, radius = 0;
-
-    int ret = grib_get_long(h, "compressedData", &compressed);
-    if (ret)
-        return ret;
-    if (compressed) {
-        long numberOfSubsets = 0;
-        ret                  = grib_get_long(h, self->numberOfSubsets, &numberOfSubsets);
-        if (ret)
-            return ret;
-
-        ret = grib_get_long(h, self->simpleThinningStart, &start);
-        if (ret)
-            return ret;
-
-        ret = grib_get_long(h, self->simpleThinningSkip, &skip);
-        if (ret)
-            return ret;
-        if (skip <= 0)
-            return GRIB_INVALID_KEY_VALUE;
-
-        ret = grib_get_long(h, self->simpleThinningMissingRadius, &radius);
-        if (ret)
-            return ret;
-
-        subsets = grib_iarray_new(c, numberOfSubsets / skip + 1, 10);
-        for (long i = 0; i < numberOfSubsets; i += skip + 1) {
-            grib_iarray_push(subsets, i + 1);
-        }
-
-        nsubsets = grib_iarray_used_size(subsets);
-
-        if (nsubsets != 0) {
-            subsets_ar = grib_iarray_get_array(subsets);
-            ret        = grib_set_long_array(h, self->extractSubsetList, subsets_ar, nsubsets);
-            grib_context_free(c, subsets_ar);
-            if (ret)
-                return ret;
-
-            ret = grib_set_long(h, "unpack", 1);
-            if (ret)
-                return ret;
-
-            ret = grib_set_long(h, self->doExtractSubsets, 1);
-            if (ret)
-                return ret;
-        }
-        grib_iarray_delete(subsets);
-    }
-    else {
-        return GRIB_NOT_IMPLEMENTED;
-    }
-
-    return ret;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    const grib_accessor_bufr_simple_thinning* self = (grib_accessor_bufr_simple_thinning*)a;
-
-    if (*len == 0)
-        return GRIB_SUCCESS;
-    int err = apply_thinning(a);
-    if (err)
-        return err;
-
-    return grib_set_long(a->parent->h, self->doExtractSubsets, 1);
-}
diff --git a/src/accessor/todo/grib_accessor_class_bufr_string_values.cc b/src/accessor/todo/grib_accessor_class_bufr_string_values.cc
deleted file mode 100644
index 02627e763..000000000
--- a/src/accessor/todo/grib_accessor_class_bufr_string_values.cc
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
-* (C) Copyright 2005- ECMWF.
-*
-* This software is licensed under the terms of the Apache Licence Version 2.0
-* which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-*
-* In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-* virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-*/
-
-/* Sequences and replication (not delayed) are resolved in this class.
-   Number of elements to which a delayed replication applies are recomputed to
-   take account of the expansion.
-   Expanded descriptors cannot contain sequences and only delayed replication
-   can appear
-*/
-
-#include "grib_api_internal.h"
-/*
-This is used by make_class.pl
-
-START_CLASS_DEF
-CLASS      = accessor
-SUPER      = grib_accessor_class_ascii
-IMPLEMENTS = unpack_string_array
-IMPLEMENTS = unpack_string
-IMPLEMENTS = init;dump;destroy
-IMPLEMENTS = value_count
-MEMBERS    = const char* dataAccessorName
-MEMBERS    = grib_accessor* dataAccessor
-
-END_CLASS_DEF
-
-*/
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static int unpack_string_array(grib_accessor*, char**, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void destroy(grib_context*, grib_accessor*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_bufr_string_values
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in ascii */
-    /* Members defined in bufr_string_values */
-    const char* dataAccessorName;
-    grib_accessor* dataAccessor;
-} grib_accessor_bufr_string_values;
-
-extern grib_accessor_class* grib_accessor_class_ascii;
-
-static grib_accessor_class _grib_accessor_class_bufr_string_values = {
-    &grib_accessor_class_ascii,                      /* super */
-    "bufr_string_values",                      /* name */
-    sizeof(grib_accessor_bufr_string_values),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    &destroy,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    &unpack_string_array,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_bufr_string_values = &_grib_accessor_class_bufr_string_values;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* args)
-{
-    grib_accessor_bufr_string_values* self = (grib_accessor_bufr_string_values*)a;
-    int n                                  = 0;
-    self->dataAccessorName                 = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
-    self->dataAccessor                     = NULL;
-    a->length                              = 0;
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    grib_dump_string_array(dumper, a, NULL);
-}
-
-static grib_accessor* get_accessor(grib_accessor* a)
-{
-    grib_accessor_bufr_string_values* self = (grib_accessor_bufr_string_values*)a;
-    if (!self->dataAccessor) {
-        self->dataAccessor = grib_find_accessor(grib_handle_of_accessor(a), self->dataAccessorName);
-    }
-    return self->dataAccessor;
-}
-
-static int unpack_string_array(grib_accessor* a, char** buffer, size_t* len)
-{
-    grib_accessor* data        = 0;
-    grib_context* c            = a->context;
-    grib_vsarray* stringValues = NULL;
-    size_t l = 0, tl;
-    size_t i, j, n = 0;
-    char** b = buffer;
-
-    data = get_accessor(a);
-    if (!data)
-        return GRIB_NOT_FOUND;
-
-    stringValues = accessor_bufr_data_array_get_stringValues(data);
-
-    n = grib_vsarray_used_size(stringValues);
-
-    tl = 0;
-    for (j = 0; j < n; j++) {
-        l = grib_sarray_used_size(stringValues->v[j]);
-        tl += l;
-
-        if (tl > *len)
-            return GRIB_ARRAY_TOO_SMALL;
-
-        for (i = 0; i < l; i++) {
-            *(b++) = grib_context_strdup(c, stringValues->v[j]->v[i]);
-        }
-    }
-    *len = tl;
-
-    return GRIB_SUCCESS;
-}
-
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static int value_count(grib_accessor* a, long* rlen)
-{
-    grib_accessor* descriptors = get_accessor(a);
-    return grib_value_count(descriptors, rlen);
-}
-
-static void destroy(grib_context* c, grib_accessor* a)
-{
-}
diff --git a/src/accessor/todo/grib_accessor_class_bufrdc_expanded_descriptors.cc b/src/accessor/todo/grib_accessor_class_bufrdc_expanded_descriptors.cc
deleted file mode 100644
index 929e21724..000000000
--- a/src/accessor/todo/grib_accessor_class_bufrdc_expanded_descriptors.cc
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
-* (C) Copyright 2005- ECMWF.
-*
-* This software is licensed under the terms of the Apache Licence Version 2.0
-* which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-*
-* In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-* virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-*/
-
-/* Sequences and replication (not delayed) are resolved in this class.
-   Number of elements to which a delayed replication applies are recomputed to
-   take account of the expansion.
-   Expanded descriptors cannot contain sequences and only delayed replication
-   can appear
-*/
-
-#include "grib_api_internal.h"
-/*
-This is used by make_class.pl
-
-START_CLASS_DEF
-CLASS      = accessor
-SUPER      = grib_accessor_class_long
-IMPLEMENTS = unpack_long
-IMPLEMENTS = unpack_string_array
-IMPLEMENTS = init;destroy
-IMPLEMENTS = value_count
-MEMBERS    = const char* expandedDescriptors
-MEMBERS    = grib_accessor* expandedDescriptorsAccessor
-
-END_CLASS_DEF
-
-*/
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string_array(grib_accessor*, char**, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void destroy(grib_context*, grib_accessor*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_bufrdc_expanded_descriptors
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in bufrdc_expanded_descriptors */
-    const char* expandedDescriptors;
-    grib_accessor* expandedDescriptorsAccessor;
-} grib_accessor_bufrdc_expanded_descriptors;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_bufrdc_expanded_descriptors = {
-    &grib_accessor_class_long,                      /* super */
-    "bufrdc_expanded_descriptors",                      /* name */
-    sizeof(grib_accessor_bufrdc_expanded_descriptors),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    &destroy,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    &unpack_string_array,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_bufrdc_expanded_descriptors = &_grib_accessor_class_bufrdc_expanded_descriptors;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* args)
-{
-    grib_accessor_bufrdc_expanded_descriptors* self = (grib_accessor_bufrdc_expanded_descriptors*)a;
-    int n                                           = 0;
-    self->expandedDescriptors                       = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
-    self->expandedDescriptorsAccessor               = 0;
-    a->length                                       = 0;
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-}
-
-static grib_accessor* get_accessor(grib_accessor* a)
-{
-    grib_accessor_bufrdc_expanded_descriptors* self = (grib_accessor_bufrdc_expanded_descriptors*)a;
-    if (!self->expandedDescriptorsAccessor) {
-        self->expandedDescriptorsAccessor = grib_find_accessor(grib_handle_of_accessor(a), self->expandedDescriptors);
-    }
-    return self->expandedDescriptorsAccessor;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor* descriptors = 0;
-    size_t rlen  = 0, l;
-    long lenall  = 0;
-    size_t i     = 0;
-    long* v      = 0;
-    grib_context* c = a->context;
-
-    descriptors = get_accessor(a);
-    if (!descriptors) return GRIB_NOT_FOUND;
-
-    grib_value_count(a, &lenall);
-    v = (long*)grib_context_malloc_clear(c, sizeof(long) * lenall);
-    l = lenall;
-    grib_unpack_long(descriptors, v, &l);
-
-    rlen = 0;
-    for (i = 0; i < l; i++) {
-        if ((v[i] < 100000 || v[i] > 221999))
-            val[rlen++] = v[i];
-    }
-    *len = rlen;
-    grib_context_free(c,v);
-
-    return GRIB_SUCCESS;
-}
-
-static int unpack_string_array(grib_accessor* a, char** buffer, size_t* len)
-{
-    int err = 0;
-    grib_accessor* descriptors = 0;
-    size_t l     = 0;
-    long lenall  = 0;
-    size_t i     = 0;
-    long* v      = 0;
-    char buf[25] = {0,};
-    grib_context* c = a->context;
-
-    descriptors = get_accessor(a);
-    if (!descriptors) return GRIB_NOT_FOUND;
-
-    err = grib_value_count(a, &lenall);
-    if (err) return err;
-    l = lenall;
-    if (l > *len) return GRIB_ARRAY_TOO_SMALL;
-
-    v = (long*)grib_context_malloc_clear(c, sizeof(long) * l);
-    err = grib_unpack_long(descriptors, v, &l);
-    if (err) return err;
-
-    for (i = 0; i < l; i++) {
-        snprintf(buf, sizeof(buf), "%06ld", v[i]);
-        buffer[i] = grib_context_strdup(c, buf);
-    }
-    *len = l;
-    grib_context_free(c,v);
-
-    return GRIB_SUCCESS;
-}
-
-static int value_count(grib_accessor* a, long* rlen)
-{
-    grib_accessor* descriptors = get_accessor(a);
-
-    return grib_value_count(descriptors, rlen);
-}
-
-static void destroy(grib_context* c, grib_accessor* a)
-{
-}
diff --git a/src/accessor/todo/grib_accessor_class_bytes.cc b/src/accessor/todo/grib_accessor_class_bytes.cc
deleted file mode 100644
index 71533095e..000000000
--- a/src/accessor/todo/grib_accessor_class_bytes.cc
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = get_native_type;init
-   IMPLEMENTS = compare;unpack_string;pack_string
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_string(grib_accessor*, const char*, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-static int compare(grib_accessor*, grib_accessor*);
-
-typedef struct grib_accessor_bytes
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in bytes */
-} grib_accessor_bytes;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_bytes = {
-    &grib_accessor_class_gen,                      /* super */
-    "bytes",                      /* name */
-    sizeof(grib_accessor_bytes),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    &pack_string,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    &compare,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_bytes = &_grib_accessor_class_bytes;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    /*grib_accessor_signed* self = (grib_accessor_signed*)a;  */
-    a->length = len;
-    Assert(a->length >= 0);
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_BYTES;
-}
-
-static int compare(grib_accessor* a, grib_accessor* b)
-{
-    int retval = GRIB_SUCCESS;
-
-    size_t alen = (size_t)grib_byte_count(a);
-    size_t blen = (size_t)grib_byte_count(b);
-
-    if (alen != blen)
-        return GRIB_COUNT_MISMATCH;
-
-    return retval;
-}
-
-static int unpack_string(grib_accessor* a, char* v, size_t* len)
-{
-    unsigned char* p = NULL;
-    char* s          = v;
-    long i = 0;
-    const long length = grib_byte_count(a);
-    const long slength = 2 * length;
-
-    if (*len < (size_t)slength) {
-        *len = slength;
-        return GRIB_BUFFER_TOO_SMALL;
-    }
-
-    p = grib_handle_of_accessor(a)->buffer->data + grib_byte_offset(a);
-
-    for (i = 0; i < length; i++) {
-        snprintf(s, INT_MAX, "%02x", *(p++));
-        s += 2;
-    }
-
-    *len = slength;
-
-    return GRIB_SUCCESS;
-}
-
-static int pack_string(grib_accessor* a, const char* val, size_t* len)
-{
-    /* The string representation (val) of the byte array will have two chars
-     * per byte e.g. 4C5B means the 2 bytes 0114 and 0133 in octal
-     * so has to be twice the length of the byte array
-     */
-    int err = 0;
-    grib_accessor_class* super = *(a->cclass->super);
-    grib_context* c = a->context;
-    size_t nbytes = a->length;
-    const size_t expected_blen = nbytes;
-    const size_t expected_slen = 2 * expected_blen;
-    unsigned char* bytearray = NULL;
-    size_t i = 0, slen = strlen(val);
-
-    if (slen != expected_slen || *len != expected_slen) {
-        grib_context_log(c, GRIB_LOG_ERROR,
-                        "%s: Key %s is %lu bytes. Expected a string with %lu characters (actual length=%zu)",
-                        __func__, a->name, expected_blen, expected_slen, *len);
-        return GRIB_WRONG_ARRAY_SIZE;
-    }
-
-    bytearray = (unsigned char*)grib_context_malloc(c, nbytes * (sizeof(unsigned char)));
-    if (!bytearray) return GRIB_OUT_OF_MEMORY;
-
-    for (i = 0; i < (slen/2); i++) {
-        unsigned int byteVal = 0;
-        if (sscanf(val + 2*i, "%02x", &byteVal) != 1) {
-            grib_context_log(c, GRIB_LOG_ERROR,"%s: Invalid hex byte specfication '%.2s'", __func__, val + 2*i);
-            grib_context_free(c, bytearray);
-            return GRIB_INVALID_KEY_VALUE;
-        }
-        Assert(byteVal < 256);
-        bytearray[i] = (int)byteVal;
-    }
-
-    /* Forward to base class to pack the byte array */
-    err = super->pack_bytes(a, bytearray, &nbytes);
-    grib_context_free(c, bytearray);
-    return err;
-}
diff --git a/src/accessor/todo/grib_accessor_class_change_alternative_row_scanning.cc b/src/accessor/todo/grib_accessor_class_change_alternative_row_scanning.cc
deleted file mode 100644
index d8eef0eb4..000000000
--- a/src/accessor/todo/grib_accessor_class_change_alternative_row_scanning.cc
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = pack_long;
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = init;get_native_type
-   MEMBERS = const char* values
-   MEMBERS = const char* Ni
-   MEMBERS = const char* Nj
-   MEMBERS = const char* alternativeRowScanning
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_change_alternative_row_scanning
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in change_alternative_row_scanning */
-    const char* values;
-    const char* Ni;
-    const char* Nj;
-    const char* alternativeRowScanning;
-} grib_accessor_change_alternative_row_scanning;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_change_alternative_row_scanning = {
-    &grib_accessor_class_gen,                      /* super */
-    "change_alternative_row_scanning",                      /* name */
-    sizeof(grib_accessor_change_alternative_row_scanning),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_change_alternative_row_scanning = &_grib_accessor_class_change_alternative_row_scanning;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* args)
-{
-    int n                                               = 0;
-    grib_accessor_change_alternative_row_scanning* self = (grib_accessor_change_alternative_row_scanning*)a;
-
-    self->values                 = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
-    self->Ni                     = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
-    self->Nj                     = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
-    self->alternativeRowScanning = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
-
-    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
-    a->length = 0;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    int err = 0;
-    grib_accessor_change_alternative_row_scanning* self = (grib_accessor_change_alternative_row_scanning*)a;
-    const grib_context* c = a->context;
-    grib_handle* h  = grib_handle_of_accessor(a);
-    long i, j, jr, theEnd, Ni, Nj, k, kp, alternativeRowScanning;
-    size_t size = 0;
-    double* values = NULL;
-    double tmp = 0.0;
-
-    if (*val == 0)
-        return 0;
-
-    /* Make sure Ni / Nj are not missing */
-    if (grib_is_missing(h, self->Ni, &err) && !err) {
-        grib_context_log(c, GRIB_LOG_ERROR, "change_alternative_row_scanning: Key %s cannot be 'missing'!", self->Ni);
-        return GRIB_WRONG_GRID;
-    }
-    if (grib_is_missing(h, self->Nj, &err) && !err) {
-        grib_context_log(c, GRIB_LOG_ERROR, "change_alternative_row_scanning: Key %s cannot be 'missing'!", self->Nj);
-        return GRIB_WRONG_GRID;
-    }
-
-    if ((err = grib_get_long_internal(h, self->Ni, &Ni)) != GRIB_SUCCESS)
-        return err;
-    if ((err = grib_get_long_internal(h, self->Nj, &Nj)) != GRIB_SUCCESS)
-        return err;
-    if ((err = grib_get_long_internal(h, self->alternativeRowScanning, &alternativeRowScanning)) != GRIB_SUCCESS)
-        return err;
-
-    if ((err = grib_get_size(h, self->values, &size)) != GRIB_SUCCESS)
-        return err;
-
-    if ( size > (size_t)(Ni * Nj) ) {
-        grib_context_log(c, GRIB_LOG_ERROR, "change_alternative_row_scanning: wrong values size!=Ni*Nj (%zu!=%ld*%ld)", size, Ni, Nj);
-        return GRIB_WRONG_ARRAY_SIZE;
-    }
-
-    values = (double*)grib_context_malloc(c, size * sizeof(double));
-    if (!values)
-        return GRIB_OUT_OF_MEMORY;
-
-    if ((err = grib_get_double_array_internal(h, self->values, values, &size)) != GRIB_SUCCESS) {
-        grib_context_free(c, values);
-        return err;
-    }
-
-    theEnd = Ni / 2;
-    for (j = 0; j < Nj; j++) {
-        jr = Ni * j;
-        for (i = 0; i < theEnd; i++) {
-            if (j % 2 == 1) {
-                /* Swap first and last value on every odd row */
-                k          = jr + i;
-                kp         = jr + Ni - i - 1;
-                tmp        = values[k];
-                values[k]  = values[kp];
-                values[kp] = tmp;
-            }
-        }
-    }
-    alternativeRowScanning = !alternativeRowScanning;
-    if ((err = grib_set_long_internal(h, self->alternativeRowScanning, alternativeRowScanning)) != GRIB_SUCCESS) {
-        grib_context_free(c, values);
-        return err;
-    }
-
-    if ((err = grib_set_double_array_internal(h, self->values, values, size)) != GRIB_SUCCESS) {
-        grib_context_free(c, values);
-        return err;
-    }
-
-    grib_context_free(c, values);
-
-    return GRIB_SUCCESS;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_LONG;
-}
-
-static int unpack_long(grib_accessor* a, long* v, size_t* len)
-{
-    /* Decoding this accessor doesn't make sense so we return a dummy value */
-    *v = -1;
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_check_internal_version.cc b/src/accessor/todo/grib_accessor_class_check_internal_version.cc
deleted file mode 100644
index d59f353de..000000000
--- a/src/accessor/todo/grib_accessor_class_check_internal_version.cc
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_ascii
-   IMPLEMENTS = value_count;string_length
-   IMPLEMENTS = init
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static size_t string_length(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_check_internal_version
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in ascii */
-    /* Members defined in check_internal_version */
-} grib_accessor_check_internal_version;
-
-extern grib_accessor_class* grib_accessor_class_ascii;
-
-static grib_accessor_class _grib_accessor_class_check_internal_version = {
-    &grib_accessor_class_ascii,                      /* super */
-    "check_internal_version",                      /* name */
-    sizeof(grib_accessor_check_internal_version),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    &string_length,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_check_internal_version = &_grib_accessor_class_check_internal_version;
-
-/* END_CLASS_IMP */
-
-/* This is the internal engine version number */
-/* We check this against the version number found in the definitions boot.def file */
-/* See the key "internalVersion"  */
-#define LATEST_ENGINE_VERSION 30
-
-static void init(grib_accessor* a, const long l, grib_arguments* args)
-{
-    /* Check version of definition files is compatible with the engine */
-    int err                    = 0;
-    long defs_file_version     = 0;
-    grib_handle* h             = grib_handle_of_accessor(a);
-    const char* s_defn_version = grib_arguments_get_name(h, args, 0);
-    Assert(s_defn_version);
-
-    err = grib_get_long_internal(h, s_defn_version, &defs_file_version);
-    if (!err) {
-        if (defs_file_version > LATEST_ENGINE_VERSION) {
-            grib_context_log(h->context, GRIB_LOG_FATAL,
-                             "Definition files version (%d) is greater than engine version (%d)!\n"
-                             "                    " /* indent for 2nd line */
-                             "These definition files are for a later version of the ecCodes engine.",
-                             defs_file_version, LATEST_ENGINE_VERSION);
-        }
-    }
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    *count = 1;
-    return 0;
-}
-
-static size_t string_length(grib_accessor* a)
-{
-    return 255;
-}
diff --git a/src/accessor/todo/grib_accessor_class_codeflag.cc b/src/accessor/todo/grib_accessor_class_codeflag.cc
deleted file mode 100644
index ab86a64b1..000000000
--- a/src/accessor/todo/grib_accessor_class_codeflag.cc
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/****************************************
- * Enrico Fucile
- **************************************/
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_unsigned
-   IMPLEMENTS = init;dump
-   IMPLEMENTS = value_count
-   MEMBERS    = const char* tablename
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int value_count(grib_accessor*, long*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_codeflag
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in unsigned */
-    long nbytes;
-    grib_arguments* arg;
-    /* Members defined in codeflag */
-    const char* tablename;
-} grib_accessor_codeflag;
-
-extern grib_accessor_class* grib_accessor_class_unsigned;
-
-static grib_accessor_class _grib_accessor_class_codeflag = {
-    &grib_accessor_class_unsigned,                      /* super */
-    "codeflag",                      /* name */
-    sizeof(grib_accessor_codeflag),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_codeflag = &_grib_accessor_class_codeflag;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* param)
-{
-    grib_accessor_codeflag* self = (grib_accessor_codeflag*)a;
-    a->length = len;
-    self->tablename = grib_arguments_get_string(grib_handle_of_accessor(a), param, 0);
-    Assert(a->length >= 0);
-}
-
-static int test_bit(long a, long b)
-{
-    DEBUG_ASSERT(b>=0);
-    return a & (1 << b);
-}
-
-static int grib_get_codeflag(grib_accessor* a, long code, char* codename)
-{
-    const grib_accessor_codeflag* self = (grib_accessor_codeflag*)a;
-    FILE* f = NULL;
-    char fname[1024];
-    char bval[50];
-    char num[50];
-    char* filename = 0;
-    char line[1024];
-    size_t i = 0;
-    int j    = 0;
-    int err  = 0;
-
-    err = grib_recompose_name(grib_handle_of_accessor(a), NULL, self->tablename, fname, 1);
-    if (err) {
-        strncpy(fname, self->tablename, sizeof(fname)-1);
-        fname[sizeof(fname)-1] = '\0';
-    }
-
-    if ((filename = grib_context_full_defs_path(a->context, fname)) == NULL) {
-        grib_context_log(a->context, GRIB_LOG_WARNING, "Cannot open flag table %s", filename);
-        strcpy(codename, "Cannot open flag table");
-        return GRIB_FILE_NOT_FOUND;
-    }
-
-    f = codes_fopen(filename, "r");
-    if (!f) {
-        grib_context_log(a->context, (GRIB_LOG_WARNING) | (GRIB_LOG_PERROR), "Cannot open flag table %s", filename);
-        strcpy(codename, "Cannot open flag table");
-        return GRIB_FILE_NOT_FOUND;
-    }
-
-    // strcpy(codename, self->tablename);
-    // strcat(codename,": ");
-    // j = strlen(codename);
-
-    while (fgets(line, sizeof(line) - 1, f)) {
-        sscanf(line, "%49s %49s", num, bval);
-
-        if (num[0] != '#') {
-            if ((test_bit(code, a->length * 8 - atol(num)) > 0) == atol(bval)) {
-                size_t linelen = strlen(line);
-                codename[j++]  = '(';
-                codename[j++]  = num[0];
-                codename[j++]  = '=';
-                codename[j++]  = bval[0];
-                codename[j++]  = ')';
-                codename[j++]  = ' ';
-                if (j)
-                    codename[j++] = ' ';
-
-                for (i = (strlen(num) + strlen(bval) + 2); i < linelen - 1; i++)
-                    codename[j++] = line[i];
-                if (line[i] != '\n')
-                    codename[j++] = line[i];
-                codename[j++] = ';';
-            }
-        }
-    }
-
-    if (j > 1 && codename[j - 1] == ';')
-        j--;
-    codename[j] = 0;
-
-    strcat(codename, ":");
-    strcat(codename, fname);
-
-    fclose(f);
-    return GRIB_SUCCESS;
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    *count = 1;
-    return 0;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    const grib_accessor_codeflag* self = (grib_accessor_codeflag*)a;
-    long v = 0;
-    char flagname[1024] = {0,};
-    char fname[1024] = {0,};
-
-    size_t llen = 1;
-
-    grib_recompose_name(grib_handle_of_accessor(a), NULL, self->tablename, fname, 1);
-    grib_unpack_long(a, &v, &llen);
-
-    grib_get_codeflag(a, v, flagname);
-
-    grib_dump_bits(dumper, a, flagname);
-}
diff --git a/src/accessor/todo/grib_accessor_class_codetable_title.cc b/src/accessor/todo/grib_accessor_class_codetable_title.cc
deleted file mode 100644
index 2ddd0f3cb..000000000
--- a/src/accessor/todo/grib_accessor_class_codetable_title.cc
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = init;unpack_string; get_native_type
-   MEMBERS    = const char* codetable
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_codetable_title
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in codetable_title */
-    const char* codetable;
-} grib_accessor_codetable_title;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_codetable_title = {
-    &grib_accessor_class_gen,                      /* super */
-    "codetable_title",                      /* name */
-    sizeof(grib_accessor_codetable_title),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_codetable_title = &_grib_accessor_class_codetable_title;
-
-/* END_CLASS_IMP */
-
-typedef struct grib_accessor_codetable
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in unsigned */
-    long nbytes;
-    grib_arguments* arg;
-    /* Members defined in codetable */
-    const char* tablename;
-    const char* masterDir;
-    const char* localDir;
-    grib_codetable* table;
-} grib_accessor_codetable;
-
-
-static void init(grib_accessor* a, const long len, grib_arguments* params)
-{
-    grib_accessor_codetable_title* self = (grib_accessor_codetable_title*)a;
-    int n                               = 0;
-    self->codetable                     = grib_arguments_get_name(grib_handle_of_accessor(a), params, n++);
-    a->length                           = 0;
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_STRING;
-}
-
-static int unpack_string(grib_accessor* a, char* buffer, size_t* len)
-{
-    grib_accessor_codetable_title* self = (grib_accessor_codetable_title*)a;
-    grib_codetable* table               = NULL;
-
-    size_t size = 1;
-    long value;
-    int err = GRIB_SUCCESS;
-    char tmp[1024];
-    size_t l                    = 1024;
-    grib_accessor_codetable* ca = (grib_accessor_codetable*)grib_find_accessor(grib_handle_of_accessor(a), self->codetable);
-
-    if ((err = grib_unpack_long((grib_accessor*)ca, &value, &size)) != GRIB_SUCCESS)
-        return err;
-
-    table = ca->table;
-
-    if (table && (value >= 0) && (value < table->size) && table->entries[value].title) {
-        strcpy(tmp, table->entries[value].title);
-    }
-    else {
-        snprintf(tmp, sizeof(tmp), "%d", (int)value);
-    }
-
-    l = strlen(tmp) + 1;
-
-    if (*len < l) {
-        const char* cclass_name = a->cclass->name;
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
-                         cclass_name, a->name, l, *len);
-        *len = l;
-        return GRIB_BUFFER_TOO_SMALL;
-    }
-
-    strcpy(buffer, tmp);
-    *len = l;
-
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_codetable_units.cc b/src/accessor/todo/grib_accessor_class_codetable_units.cc
deleted file mode 100644
index de9a9655f..000000000
--- a/src/accessor/todo/grib_accessor_class_codetable_units.cc
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = init;unpack_string; get_native_type
-   MEMBERS    = const char* codetable
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_codetable_units
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in codetable_units */
-    const char* codetable;
-} grib_accessor_codetable_units;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_codetable_units = {
-    &grib_accessor_class_gen,                      /* super */
-    "codetable_units",                      /* name */
-    sizeof(grib_accessor_codetable_units),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_codetable_units = &_grib_accessor_class_codetable_units;
-
-/* END_CLASS_IMP */
-
-typedef struct grib_accessor_codetable
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in unsigned */
-    long nbytes;
-    grib_arguments* arg;
-    /* Members defined in codetable */
-    const char* tablename;
-    const char* masterDir;
-    const char* localDir;
-    grib_codetable* table;
-} grib_accessor_codetable;
-
-static void init(grib_accessor* a, const long len, grib_arguments* params)
-{
-    grib_accessor_codetable_units* self = (grib_accessor_codetable_units*)a;
-
-    int n           = 0;
-    self->codetable = grib_arguments_get_name(grib_handle_of_accessor(a), params, n++);
-    a->length       = 0;
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_STRING;
-}
-
-static int unpack_string(grib_accessor* a, char* buffer, size_t* len)
-{
-    grib_accessor_codetable_units* self = (grib_accessor_codetable_units*)a;
-    grib_codetable* table = NULL;
-
-    size_t size = 1;
-    long value;
-    int err = GRIB_SUCCESS;
-    char tmp[1024];
-    size_t l = sizeof(tmp);
-    grib_accessor_codetable* ca = (grib_accessor_codetable*)grib_find_accessor(grib_handle_of_accessor(a), self->codetable);
-
-    if ((err = grib_unpack_long((grib_accessor*)ca, &value, &size)) != GRIB_SUCCESS)
-        return err;
-
-    table = ca->table;
-
-    if (table && (value >= 0) && (value < table->size) && table->entries[value].units) {
-        strcpy(tmp, table->entries[value].units);
-    }
-    else {
-        snprintf(tmp, sizeof(tmp), "%d", (int)value);
-    }
-
-    l = strlen(tmp) + 1;
-
-    if (*len < l) {
-        const char* cclass_name = a->cclass->name;
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
-                         cclass_name, a->name, l, *len);
-        *len = l;
-        return GRIB_BUFFER_TOO_SMALL;
-    }
-
-    strcpy(buffer, tmp);
-    *len = l;
-
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_count_file.cc b/src/accessor/todo/grib_accessor_class_count_file.cc
deleted file mode 100644
index 196a48038..000000000
--- a/src/accessor/todo/grib_accessor_class_count_file.cc
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/***********************************************
- *  Enrico Fucile
- **********************************************/
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = init
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_count_file
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in count_file */
-} grib_accessor_count_file;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_count_file = {
-    &grib_accessor_class_long,                      /* super */
-    "count_file",                      /* name */
-    sizeof(grib_accessor_count_file),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_count_file = &_grib_accessor_class_count_file;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->length = 0;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    *val = grib_context_get_handle_file_count(a->context);
-    *len = 1;
-    return 0;
-}
diff --git a/src/accessor/todo/grib_accessor_class_count_total.cc b/src/accessor/todo/grib_accessor_class_count_total.cc
deleted file mode 100644
index 022cc4998..000000000
--- a/src/accessor/todo/grib_accessor_class_count_total.cc
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-
-/***************************************************
- * Enrico Fucile
- **************************************************/
-
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = init
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_count_total
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in count_total */
-} grib_accessor_count_total;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_count_total = {
-    &grib_accessor_class_long,                      /* super */
-    "count_total",                      /* name */
-    sizeof(grib_accessor_count_total),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_count_total = &_grib_accessor_class_count_total;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->length = 0;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    *val = grib_context_get_handle_total_count(a->context);
-    *len = 1;
-    return 0;
-}
diff --git a/src/accessor/todo/grib_accessor_class_data_dummy_field.cc b/src/accessor/todo/grib_accessor_class_data_dummy_field.cc
deleted file mode 100644
index 65b6d5a8f..000000000
--- a/src/accessor/todo/grib_accessor_class_data_dummy_field.cc
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_data_g1simple_packing
-   IMPLEMENTS = init
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = value_count
-   IMPLEMENTS = pack_double
-   MEMBERS=const char*  missing_value
-   MEMBERS=const char*  numberOfPoints
-   MEMBERS=const char*  bitmap
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_data_dummy_field
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in values */
-    int  carg;
-    const char* seclen;
-    const char* offsetdata;
-    const char* offsetsection;
-    int dirty;
-    /* Members defined in data_simple_packing */
-    int edition;
-    const char*  units_factor;
-    const char*  units_bias;
-    const char*  changing_precision;
-    const char*  number_of_values;
-    const char*  bits_per_value;
-    const char*  reference_value;
-    const char*  binary_scale_factor;
-    const char*  decimal_scale_factor;
-    const char*  optimize_scaling_factor;
-    /* Members defined in data_g1simple_packing */
-    const char*  half_byte;
-    const char*  packingType;
-    const char*  ieee_packing;
-    const char*  precision;
-    /* Members defined in data_dummy_field */
-    const char*  missing_value;
-    const char*  numberOfPoints;
-    const char*  bitmap;
-} grib_accessor_data_dummy_field;
-
-extern grib_accessor_class* grib_accessor_class_data_g1simple_packing;
-
-static grib_accessor_class _grib_accessor_class_data_dummy_field = {
-    &grib_accessor_class_data_g1simple_packing,                      /* super */
-    "data_dummy_field",                      /* name */
-    sizeof(grib_accessor_data_dummy_field),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_data_dummy_field = &_grib_accessor_class_data_dummy_field;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    grib_accessor_data_dummy_field* self = (grib_accessor_data_dummy_field*)a;
-    self->missing_value  = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
-    self->numberOfPoints = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
-    self->bitmap         = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_data_dummy_field* self = (grib_accessor_data_dummy_field*)a;
-    size_t i = 0, n_vals = 0;
-    long numberOfPoints;
-    double missing_value = 0;
-    int err = 0;
-
-    if ((err = grib_get_long_internal(grib_handle_of_accessor(a), self->numberOfPoints, &numberOfPoints)) != GRIB_SUCCESS)
-        return err;
-    n_vals = numberOfPoints;
-
-    if ((err = grib_get_double_internal(grib_handle_of_accessor(a), self->missing_value, &missing_value)) != GRIB_SUCCESS)
-        return err;
-
-    if (*len < n_vals) {
-        *len = n_vals;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    for (i = 0; i < n_vals; i++)
-        val[i] = missing_value;
-
-    if (grib_find_accessor(grib_handle_of_accessor(a), self->bitmap)) {
-        if ((err = grib_set_double_array_internal(grib_handle_of_accessor(a), self->bitmap, val, n_vals)) != GRIB_SUCCESS)
-            return err;
-    }
-
-    *len = (long)n_vals;
-    return err;
-}
-
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_data_dummy_field* self = (grib_accessor_data_dummy_field*)a;
-
-    size_t n_vals = *len;
-    int err       = 0;
-    long bits_per_value = 0;
-    long half_byte = 0;
-    size_t buflen  = 0;
-    unsigned char* buf = NULL;
-
-    if (*len == 0)
-        return GRIB_NO_VALUES;
-
-    if ((err = grib_get_long_internal(grib_handle_of_accessor(a), self->bits_per_value, &bits_per_value)) != GRIB_SUCCESS)
-        return err;
-
-    buflen = (1 + ((bits_per_value * n_vals) / 8)) * sizeof(unsigned char);
-
-    buf = (unsigned char*)grib_context_malloc_clear(a->context, buflen);
-    if (!buf)
-        return GRIB_OUT_OF_MEMORY;
-
-    half_byte = (buflen * 8) - ((*len) * bits_per_value);
-
-    if ((err = grib_set_long_internal(grib_handle_of_accessor(a), self->half_byte, half_byte)) != GRIB_SUCCESS) {
-        grib_context_free(a->context, buf);
-        return err;
-    }
-    grib_buffer_replace(a, buf, buflen, 1, 1);
-
-    grib_context_free(a->context, buf);
-
-    return GRIB_SUCCESS;
-}
-
-static int value_count(grib_accessor* a, long* numberOfPoints)
-{
-    grib_accessor_data_dummy_field* self = (grib_accessor_data_dummy_field*)a;
-    int err = 0;
-    *numberOfPoints = 0;
-
-    if ((err = grib_get_long_internal(grib_handle_of_accessor(a), self->numberOfPoints, numberOfPoints)) != GRIB_SUCCESS) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "Unable to get count of %s (%s)", a->name, grib_get_error_message(err));
-    }
-
-    return err;
-}
diff --git a/src/accessor/todo/grib_accessor_class_data_g1complex_packing.cc b/src/accessor/todo/grib_accessor_class_data_g1complex_packing.cc
deleted file mode 100644
index 6c8fa5cd6..000000000
--- a/src/accessor/todo/grib_accessor_class_data_g1complex_packing.cc
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_data_complex_packing
-   IMPLEMENTS = pack_double
-   IMPLEMENTS = init
-   MEMBERS= const char*  N
-   MEMBERS=const char*  half_byte
-   MEMBERS=const char*  packingType
-   MEMBERS=const char*  ieee_packing
-   MEMBERS=const char*  precision
-   END_CLASS_DEF
-
- */
-
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_data_g1complex_packing
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in values */
-    int  carg;
-    const char* seclen;
-    const char* offsetdata;
-    const char* offsetsection;
-    int dirty;
-    /* Members defined in data_simple_packing */
-    int edition;
-    const char*  units_factor;
-    const char*  units_bias;
-    const char*  changing_precision;
-    const char*  number_of_values;
-    const char*  bits_per_value;
-    const char*  reference_value;
-    const char*  binary_scale_factor;
-    const char*  decimal_scale_factor;
-    const char*  optimize_scaling_factor;
-    /* Members defined in data_complex_packing */
-    const char*  GRIBEX_sh_bug_present;
-    const char*  ieee_floats;
-    const char*  laplacianOperatorIsSet;
-    const char*  laplacianOperator;
-    const char*  sub_j;
-    const char*  sub_k;
-    const char*  sub_m;
-    const char*  pen_j;
-    const char*  pen_k;
-    const char*  pen_m;
-    /* Members defined in data_g1complex_packing */
-    const char*  N;
-    const char*  half_byte;
-    const char*  packingType;
-    const char*  ieee_packing;
-    const char*  precision;
-} grib_accessor_data_g1complex_packing;
-
-extern grib_accessor_class* grib_accessor_class_data_complex_packing;
-
-static grib_accessor_class _grib_accessor_class_data_g1complex_packing = {
-    &grib_accessor_class_data_complex_packing,                      /* super */
-    "data_g1complex_packing",                      /* name */
-    sizeof(grib_accessor_data_g1complex_packing),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_data_g1complex_packing = &_grib_accessor_class_data_g1complex_packing;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    grib_accessor_data_g1complex_packing* self = (grib_accessor_data_g1complex_packing*)a;
-    self->half_byte                            = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
-    self->N                                    = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
-    self->packingType                          = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
-    self->ieee_packing                         = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
-    self->precision                            = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
-    self->edition                              = 1;
-    a->flags |= GRIB_ACCESSOR_FLAG_DATA;
-}
-
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_data_g1complex_packing* self = (grib_accessor_data_g1complex_packing*)a;
-    int ret              = GRIB_SUCCESS;
-    long seclen          = 0;
-    long sub_j           = 0;
-    long sub_k           = 0;
-    long sub_m           = 0;
-    long n               = 0;
-    long half_byte       = 0;
-    long bits_per_value  = 0;
-    size_t buflen        = 0;
-    grib_accessor_class* super = *(a->cclass->super);
-
-    if (*len == 0)
-        return GRIB_NO_VALUES;
-
-//     /* TODO: spectral_ieee does not work */
-//     if (c->ieee_packing && self->ieee_packing) {
-//         grib_handle* h       = grib_handle_of_accessor(a);
-//         grib_context* c      = a->context;
-//         char* packingType_s  = NULL;
-//         char* ieee_packing_s = NULL;
-//         long precision = c->ieee_packing == 32 ? 1 : 2;
-//         size_t lenstr  = strlen(self->ieee_packing);
-
-//         packingType_s  = grib_context_strdup(c, self->packingType);
-//         ieee_packing_s = grib_context_strdup(c, self->ieee_packing);
-//         precision_s    = grib_context_strdup(c, self->precision);
-
-//         grib_set_string(h, packingType_s, ieee_packing_s, &lenstr);
-//         grib_set_long(h, precision_s, precision);
-
-//         grib_context_free(c, packingType_s);
-//         grib_context_free(c, ieee_packing_s);
-//         grib_context_free(c, precision_s);
-//         return grib_set_double_array(h, "values", val, *len);
-//     }
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->sub_j, &sub_j)) != GRIB_SUCCESS)
-        return ret;
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->sub_k, &sub_k)) != GRIB_SUCCESS)
-        return ret;
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->sub_m, &sub_m)) != GRIB_SUCCESS)
-        return ret;
-
-    self->dirty = 1;
-
-    Assert((sub_j == sub_k) && (sub_m == sub_j));
-
-    ret = super->pack_double(a, val, len);
-
-    if (ret == GRIB_SUCCESS) {
-        n = a->offset + 4 * ((sub_k + 1) * (sub_k + 2));
-
-        /*     Octet number starts from beginning of message but shouldn't     */
-        if ((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->N, n)) != GRIB_SUCCESS)
-            return ret;
-
-        // ret = grib_get_long_internal(grib_handle_of_accessor(a), self->offsetsection, &offsetsection);
-        // if (ret != GRIB_SUCCESS)
-        //     return ret;
-        // if ((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->N, n - offsetsection)) != GRIB_SUCCESS)
-        //     return ret;
-
-        ret = grib_get_long_internal(grib_handle_of_accessor(a), self->bits_per_value, &bits_per_value);
-        if (ret != GRIB_SUCCESS)
-            return ret;
-
-        ret = grib_get_long_internal(grib_handle_of_accessor(a), self->seclen, &seclen);
-        if (ret != GRIB_SUCCESS)
-            return ret;
-
-        buflen    = 32 * (sub_k + 1) * (sub_k + 2) + (*len - (sub_k + 1) * (sub_k + 2)) * bits_per_value + 18 * 8;
-        half_byte = seclen * 8 - buflen;
-        if (a->context->debug == -1) {
-            fprintf(stderr, "ECCODES DEBUG: half_byte=%ld\n", half_byte);
-        }
-
-        ret = grib_set_long_internal(grib_handle_of_accessor(a), self->half_byte, half_byte);
-        if (ret != GRIB_SUCCESS)
-            return ret;
-    }
-    return ret;
-}
diff --git a/src/accessor/todo/grib_accessor_class_data_g1secondary_bitmap.cc b/src/accessor/todo/grib_accessor_class_data_g1secondary_bitmap.cc
deleted file mode 100644
index 4ae89c576..000000000
--- a/src/accessor/todo/grib_accessor_class_data_g1secondary_bitmap.cc
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_data_secondary_bitmap
-   IMPLEMENTS = init
-   IMPLEMENTS = pack_double
-   IMPLEMENTS = value_count
-   MEMBERS=const char*  number_of_ones
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_data_g1secondary_bitmap
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in data_secondary_bitmap */
-    const char*  primary_bitmap;
-    const char*  secondary_bitmap;
-    const char*  missing_value;
-    const char*  expand_by;
-    /* Members defined in data_g1secondary_bitmap */
-    const char*  number_of_ones;
-} grib_accessor_data_g1secondary_bitmap;
-
-extern grib_accessor_class* grib_accessor_class_data_secondary_bitmap;
-
-static grib_accessor_class _grib_accessor_class_data_g1secondary_bitmap = {
-    &grib_accessor_class_data_secondary_bitmap,                      /* super */
-    "data_g1secondary_bitmap",                      /* name */
-    sizeof(grib_accessor_data_g1secondary_bitmap),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_data_g1secondary_bitmap = &_grib_accessor_class_data_g1secondary_bitmap;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    grib_accessor_data_g1secondary_bitmap* self = (grib_accessor_data_g1secondary_bitmap*)a;
-    self->number_of_ones                        = grib_arguments_get_name(grib_handle_of_accessor(a), args, 4);
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    grib_accessor_data_g1secondary_bitmap* self = (grib_accessor_data_g1secondary_bitmap*)a;
-    size_t len                                  = 0;
-    int err                                     = 0;
-    long expand_by;
-    *count = 0;
-
-    err = grib_get_long_internal(grib_handle_of_accessor(a), self->expand_by, &expand_by);
-    if (err)
-        return err;
-
-    err = grib_get_size(grib_handle_of_accessor(a), self->primary_bitmap, &len);
-    if (err)
-        return err;
-
-    *count = expand_by * len;
-    return GRIB_SUCCESS;
-}
-
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_data_g1secondary_bitmap* self = (grib_accessor_data_g1secondary_bitmap*)a;
-
-    int err = 0;
-
-    long primary_len         = 0;
-    long secondary_len       = 0;
-    double* primary_bitmap   = NULL;
-    double* secondary_bitmap = NULL;
-    long i                   = 0;
-    long j                   = 0;
-    long on                  = 0;
-    long k;
-    long m;
-    double missing_value = 0;
-    double present_value = 0;
-    long expand_by       = 0;
-
-    if (*len == 0)
-        return GRIB_NO_VALUES;
-
-    if ((err = grib_get_long(grib_handle_of_accessor(a), self->expand_by, &expand_by)) != GRIB_SUCCESS)
-        return err;
-    if (expand_by <= 0)
-        return GRIB_ENCODING_ERROR;
-
-    if ((err = grib_get_double_internal(grib_handle_of_accessor(a), self->missing_value, &missing_value)) != GRIB_SUCCESS)
-        return err;
-
-    if (*len % expand_by) {
-        /*TODO: issue warning */
-        return GRIB_ENCODING_ERROR;
-    }
-
-    primary_len    = *len / expand_by;
-    primary_bitmap = (double*)grib_context_malloc_clear(a->context, primary_len * sizeof(double));
-    if (!primary_bitmap)
-        return GRIB_OUT_OF_MEMORY;
-
-    secondary_len    = *len;
-    secondary_bitmap = (double*)grib_context_malloc_clear(a->context, secondary_len * sizeof(double));
-    if (!secondary_bitmap) {
-        grib_context_free(a->context, primary_bitmap);
-        return GRIB_OUT_OF_MEMORY;
-    }
-
-    if (missing_value == 0)
-        present_value = 1;
-    else
-        present_value = 0;
-
-    k = 0;
-    m = 0;
-    for (i = 0; i < *len; i += expand_by) {
-        int cnt = 0;
-        for (j = 0; j < expand_by; j++)
-            if (val[i + j] == missing_value)
-                cnt++;
-
-        if (cnt == expand_by) /* all expand_by values are missing */
-            primary_bitmap[k++] = missing_value;
-        else {
-            primary_bitmap[k++] = present_value;
-            for (j = 0; j < expand_by; j++)
-                secondary_bitmap[m++] = val[i + j];
-            on++;
-        }
-    }
-
-    *len = k;
-
-    /*printf("QQQQQQQ %ld %ld second=%ld\n",primary_len,on,m);*/
-    Assert(k == primary_len);
-
-    err = grib_set_double_array_internal(grib_handle_of_accessor(a), self->primary_bitmap, primary_bitmap, k);
-    if (err == GRIB_SUCCESS)
-        err = grib_set_double_array_internal(grib_handle_of_accessor(a), self->secondary_bitmap, secondary_bitmap, m);
-
-    grib_context_free(a->context, primary_bitmap);
-    grib_context_free(a->context, secondary_bitmap);
-
-    if (err == GRIB_SUCCESS)
-        err = grib_set_long_internal(grib_handle_of_accessor(a), self->number_of_ones, on);
-
-    return err;
-}
diff --git a/src/accessor/todo/grib_accessor_class_data_g1shsimple_packing.cc b/src/accessor/todo/grib_accessor_class_data_g1shsimple_packing.cc
deleted file mode 100644
index 332b0af0c..000000000
--- a/src/accessor/todo/grib_accessor_class_data_g1shsimple_packing.cc
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_data_shsimple_packing
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = value_count
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-
-typedef struct grib_accessor_data_g1shsimple_packing
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in data_shsimple_packing */
-    const char*  coded_values;
-    const char*  real_part;
-    int dirty;
-    /* Members defined in data_g1shsimple_packing */
-} grib_accessor_data_g1shsimple_packing;
-
-extern grib_accessor_class* grib_accessor_class_data_shsimple_packing;
-
-static grib_accessor_class _grib_accessor_class_data_g1shsimple_packing = {
-    &grib_accessor_class_data_shsimple_packing,                      /* super */
-    "data_g1shsimple_packing",                      /* name */
-    sizeof(grib_accessor_data_g1shsimple_packing),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    0,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_data_g1shsimple_packing = &_grib_accessor_class_data_g1shsimple_packing;
-
-/* END_CLASS_IMP */
-
-
-static int value_count(grib_accessor* a, long* count)
-{
-    grib_accessor_data_g1shsimple_packing* self = (grib_accessor_data_g1shsimple_packing*)a;
-    size_t len                                  = 0;
-    int err                                     = 0;
-
-    err = grib_get_size(grib_handle_of_accessor(a), self->coded_values, &len);
-    len += 1;
-
-    *count = len;
-    return err;
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_data_g1shsimple_packing* self = (grib_accessor_data_g1shsimple_packing*)a;
-    int err                                     = GRIB_SUCCESS;
-
-    size_t coded_n_vals = 0;
-    size_t n_vals       = 0;
-
-    if ((err = grib_get_size(grib_handle_of_accessor(a), self->coded_values, &coded_n_vals)) != GRIB_SUCCESS)
-        return err;
-
-    n_vals = coded_n_vals + 1;
-
-    if (*len < n_vals) {
-        *len = n_vals;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    if ((err = grib_get_double_internal(grib_handle_of_accessor(a), self->real_part, val)) != GRIB_SUCCESS)
-        return err;
-
-    val++;
-
-    if ((err = grib_get_double_array_internal(grib_handle_of_accessor(a), self->coded_values, val, &coded_n_vals)) != GRIB_SUCCESS)
-        return err;
-
-    grib_context_log(a->context, GRIB_LOG_DEBUG,
-                     "grib_accessor_data_g1shsimple_packing_bitmap : unpack_double : creating %s, %d values",
-                     a->name, n_vals);
-
-    *len = n_vals;
-
-    return err;
-}
diff --git a/src/accessor/todo/grib_accessor_class_data_g2complex_packing.cc b/src/accessor/todo/grib_accessor_class_data_g2complex_packing.cc
deleted file mode 100644
index 98bcaf5cc..000000000
--- a/src/accessor/todo/grib_accessor_class_data_g2complex_packing.cc
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_data_complex_packing
-   IMPLEMENTS = pack_double
-   IMPLEMENTS = value_count
-   IMPLEMENTS = init
-   MEMBERS=const char*  numberOfValues
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_data_g2complex_packing
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in values */
-    int  carg;
-    const char* seclen;
-    const char* offsetdata;
-    const char* offsetsection;
-    int dirty;
-    /* Members defined in data_simple_packing */
-    int edition;
-    const char*  units_factor;
-    const char*  units_bias;
-    const char*  changing_precision;
-    const char*  number_of_values;
-    const char*  bits_per_value;
-    const char*  reference_value;
-    const char*  binary_scale_factor;
-    const char*  decimal_scale_factor;
-    const char*  optimize_scaling_factor;
-    /* Members defined in data_complex_packing */
-    const char*  GRIBEX_sh_bug_present;
-    const char*  ieee_floats;
-    const char*  laplacianOperatorIsSet;
-    const char*  laplacianOperator;
-    const char*  sub_j;
-    const char*  sub_k;
-    const char*  sub_m;
-    const char*  pen_j;
-    const char*  pen_k;
-    const char*  pen_m;
-    /* Members defined in data_g2complex_packing */
-    const char*  numberOfValues;
-} grib_accessor_data_g2complex_packing;
-
-extern grib_accessor_class* grib_accessor_class_data_complex_packing;
-
-static grib_accessor_class _grib_accessor_class_data_g2complex_packing = {
-    &grib_accessor_class_data_complex_packing,                      /* super */
-    "data_g2complex_packing",                      /* name */
-    sizeof(grib_accessor_data_g2complex_packing),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_data_g2complex_packing = &_grib_accessor_class_data_g2complex_packing;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    grib_accessor_data_g2complex_packing* self = (grib_accessor_data_g2complex_packing*)a;
-    self->numberOfValues                       = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
-    self->edition                              = 2;
-
-    a->flags |= GRIB_ACCESSOR_FLAG_DATA;
-}
-
-static int value_count(grib_accessor* a, long* numberOfValues)
-{
-    grib_accessor_data_g2complex_packing* self = (grib_accessor_data_g2complex_packing*)a;
-    *numberOfValues                            = 0;
-
-    return grib_get_long(grib_handle_of_accessor(a), self->numberOfValues, numberOfValues);
-}
-
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_data_g2complex_packing* self = (grib_accessor_data_g2complex_packing*)a;
-    int ret                                    = GRIB_SUCCESS;
-    grib_accessor_class* super                 = *(a->cclass->super);
-
-    if (*len == 0)
-        return GRIB_NO_VALUES;
-
-    ret = super->pack_double(a, val, len);
-
-    if (ret == GRIB_SUCCESS)
-        ret = grib_set_long_internal(grib_handle_of_accessor(a), self->numberOfValues, *len);
-
-    return ret;
-}
diff --git a/src/accessor/todo/grib_accessor_class_data_g2secondary_bitmap.cc b/src/accessor/todo/grib_accessor_class_data_g2secondary_bitmap.cc
deleted file mode 100644
index cceb3d765..000000000
--- a/src/accessor/todo/grib_accessor_class_data_g2secondary_bitmap.cc
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_data_secondary_bitmap
-   IMPLEMENTS = init
-   IMPLEMENTS = pack_double
-   IMPLEMENTS = value_count
-   MEMBERS=const char*  number_of_values
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_data_g2secondary_bitmap
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in data_secondary_bitmap */
-    const char*  primary_bitmap;
-    const char*  secondary_bitmap;
-    const char*  missing_value;
-    const char*  expand_by;
-    /* Members defined in data_g2secondary_bitmap */
-    const char*  number_of_values;
-} grib_accessor_data_g2secondary_bitmap;
-
-extern grib_accessor_class* grib_accessor_class_data_secondary_bitmap;
-
-static grib_accessor_class _grib_accessor_class_data_g2secondary_bitmap = {
-    &grib_accessor_class_data_secondary_bitmap,                      /* super */
-    "data_g2secondary_bitmap",                      /* name */
-    sizeof(grib_accessor_data_g2secondary_bitmap),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_data_g2secondary_bitmap = &_grib_accessor_class_data_g2secondary_bitmap;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    grib_accessor_data_g2secondary_bitmap* self = (grib_accessor_data_g2secondary_bitmap*)a;
-    self->number_of_values = grib_arguments_get_name(grib_handle_of_accessor(a), args, 4);
-}
-
-static int value_count(grib_accessor* a, long* len)
-{
-    grib_accessor_data_g2secondary_bitmap* self = (grib_accessor_data_g2secondary_bitmap*)a;
-    *len = 0;
-    return grib_get_long_internal(grib_handle_of_accessor(a), self->number_of_values, len);
-}
-
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_data_g2secondary_bitmap* self = (grib_accessor_data_g2secondary_bitmap*)a;
-    int err = 0;
-
-    long primary_len = 0, secondary_len = 0;
-    double* primary_bitmap   = NULL;
-    double* secondary_bitmap = NULL;
-    long i = 0, j = 0, k = 0, m = 0;
-    double missing_value = 0, present_value = 0;
-    long expand_by = 0;
-
-    if (*len == 0)
-        return GRIB_NO_VALUES;
-
-    if ((err = grib_get_long(grib_handle_of_accessor(a), self->expand_by, &expand_by)) != GRIB_SUCCESS)
-        return err;
-    if (expand_by <= 0)
-        return GRIB_ENCODING_ERROR;
-
-    if ((err = grib_get_double_internal(grib_handle_of_accessor(a), self->missing_value, &missing_value)) != GRIB_SUCCESS)
-        return err;
-
-    if (*len % expand_by) {
-        /*TODO: issue warning */
-        return GRIB_ENCODING_ERROR;
-    }
-
-    primary_len    = *len / expand_by;
-    primary_bitmap = (double*)grib_context_malloc_clear(a->context, primary_len * sizeof(double));
-    if (!primary_bitmap)
-        return GRIB_OUT_OF_MEMORY;
-
-    secondary_len    = *len;
-    secondary_bitmap = (double*)grib_context_malloc_clear(a->context, secondary_len * sizeof(double));
-    if (!secondary_bitmap) {
-        grib_context_free(a->context, primary_bitmap);
-        return GRIB_OUT_OF_MEMORY;
-    }
-
-    if (missing_value == 0)
-        present_value = 1;
-    else
-        present_value = 0;
-
-    k = 0;
-    m = 0;
-    for (i = 0; i < *len; i += expand_by) {
-        int cnt = 0;
-        for (j = 0; j < expand_by; j++)
-            if (val[i + j] == missing_value)
-                cnt++;
-
-        if (cnt == expand_by) /* all expand_by values are missing */
-            primary_bitmap[k++] = missing_value;
-        else {
-            primary_bitmap[k++] = present_value;
-            for (j = 0; j < expand_by; j++)
-                secondary_bitmap[m++] = val[i + j];
-            //on++;
-        }
-    }
-
-    *len = k;
-
-    Assert(k == primary_len);
-
-    err = grib_set_double_array_internal(grib_handle_of_accessor(a), self->primary_bitmap, primary_bitmap, k);
-    if (err == GRIB_SUCCESS)
-        err = grib_set_double_array_internal(grib_handle_of_accessor(a), self->secondary_bitmap, secondary_bitmap, m);
-
-    grib_context_free(a->context, primary_bitmap);
-    grib_context_free(a->context, secondary_bitmap);
-
-    if (err == GRIB_SUCCESS)
-        err = grib_set_long_internal(grib_handle_of_accessor(a), self->number_of_values, *len * expand_by);
-
-    return err;
-}
diff --git a/src/accessor/todo/grib_accessor_class_data_g2shsimple_packing.cc b/src/accessor/todo/grib_accessor_class_data_g2shsimple_packing.cc
deleted file mode 100644
index bdb1157cf..000000000
--- a/src/accessor/todo/grib_accessor_class_data_g2shsimple_packing.cc
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_data_shsimple_packing
-   IMPLEMENTS = init
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = pack_double
-   IMPLEMENTS = value_count
-   MEMBERS=const char*  numberOfValues
-   MEMBERS=const char*  numberOfDataPoints
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_data_g2shsimple_packing
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in data_shsimple_packing */
-    const char*  coded_values;
-    const char*  real_part;
-    int dirty;
-    /* Members defined in data_g2shsimple_packing */
-    const char*  numberOfValues;
-    const char*  numberOfDataPoints;
-} grib_accessor_data_g2shsimple_packing;
-
-extern grib_accessor_class* grib_accessor_class_data_shsimple_packing;
-
-static grib_accessor_class _grib_accessor_class_data_g2shsimple_packing = {
-    &grib_accessor_class_data_shsimple_packing,                      /* super */
-    "data_g2shsimple_packing",                      /* name */
-    sizeof(grib_accessor_data_g2shsimple_packing),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_data_g2shsimple_packing = &_grib_accessor_class_data_g2shsimple_packing;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    grib_accessor_data_g2shsimple_packing* self = (grib_accessor_data_g2shsimple_packing*)a;
-
-    self->numberOfValues     = grib_arguments_get_name(grib_handle_of_accessor(a), args, 2);
-    self->numberOfDataPoints = grib_arguments_get_name(grib_handle_of_accessor(a), args, 3);
-    a->flags |= GRIB_ACCESSOR_FLAG_DATA;
-}
-
-static int value_count(grib_accessor* a, long* len)
-{
-    grib_accessor_data_g2shsimple_packing* self = (grib_accessor_data_g2shsimple_packing*)a;
-    *len                                        = 0;
-    return grib_get_long(grib_handle_of_accessor(a), self->numberOfValues, len);
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_data_g2shsimple_packing* self = (grib_accessor_data_g2shsimple_packing*)a;
-    int err                                     = GRIB_SUCCESS;
-
-    size_t n_vals = 0;
-
-    if ((err = grib_get_size(grib_handle_of_accessor(a), self->coded_values, &n_vals)) != GRIB_SUCCESS)
-        return err;
-
-    self->dirty = 0;
-
-    /* n_vals = coded_n_vals+1; */
-
-    if (*len < n_vals) {
-        *len = n_vals;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    if ((err = grib_get_double_internal(grib_handle_of_accessor(a), self->real_part, val)) != GRIB_SUCCESS)
-        return err;
-
-    val++;
-
-    if ((err = grib_get_double_array_internal(grib_handle_of_accessor(a), self->coded_values, val, &n_vals)) != GRIB_SUCCESS)
-        return err;
-
-    *len = n_vals;
-
-    return err;
-}
-
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_data_g2shsimple_packing* self = (grib_accessor_data_g2shsimple_packing*)a;
-    int err                                     = GRIB_SUCCESS;
-
-    size_t coded_n_vals = *len - 1;
-    size_t n_vals       = *len;
-
-    if (*len == 0)
-        return GRIB_NO_VALUES;
-
-    self->dirty = 1;
-
-    if ((err = grib_set_double_internal(grib_handle_of_accessor(a), self->real_part, *val)) != GRIB_SUCCESS)
-        return err;
-
-    val++;
-
-    if ((err = grib_set_double_array_internal(grib_handle_of_accessor(a), self->coded_values, val, coded_n_vals)) != GRIB_SUCCESS)
-        return err;
-
-    *len = n_vals;
-
-    if ((err = grib_set_long_internal(grib_handle_of_accessor(a), self->numberOfValues, (long)n_vals)) != GRIB_SUCCESS)
-        return err;
-    if ((err = grib_set_long_internal(grib_handle_of_accessor(a), self->numberOfDataPoints, (long)n_vals)) != GRIB_SUCCESS)
-        return err;
-
-    return err;
-}
diff --git a/src/accessor/todo/grib_accessor_class_data_g2simple_packing_with_preprocessing.cc b/src/accessor/todo/grib_accessor_class_data_g2simple_packing_with_preprocessing.cc
deleted file mode 100644
index 88a4de2cb..000000000
--- a/src/accessor/todo/grib_accessor_class_data_g2simple_packing_with_preprocessing.cc
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-#define DIRECT  0
-#define INVERSE 1
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_data_g2simple_packing
-   IMPLEMENTS = init
-   IMPLEMENTS = pack_double
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = value_count
-   MEMBERS=const char*  pre_processing
-   MEMBERS=const char*  pre_processing_parameter
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_data_g2simple_packing_with_preprocessing
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in values */
-    int  carg;
-    const char* seclen;
-    const char* offsetdata;
-    const char* offsetsection;
-    int dirty;
-    /* Members defined in data_simple_packing */
-    int edition;
-    const char*  units_factor;
-    const char*  units_bias;
-    const char*  changing_precision;
-    const char*  number_of_values;
-    const char*  bits_per_value;
-    const char*  reference_value;
-    const char*  binary_scale_factor;
-    const char*  decimal_scale_factor;
-    const char*  optimize_scaling_factor;
-    /* Members defined in data_g2simple_packing */
-    /* Members defined in data_g2simple_packing_with_preprocessing */
-    const char*  pre_processing;
-    const char*  pre_processing_parameter;
-} grib_accessor_data_g2simple_packing_with_preprocessing;
-
-extern grib_accessor_class* grib_accessor_class_data_g2simple_packing;
-
-static grib_accessor_class _grib_accessor_class_data_g2simple_packing_with_preprocessing = {
-    &grib_accessor_class_data_g2simple_packing,                      /* super */
-    "data_g2simple_packing_with_preprocessing",                      /* name */
-    sizeof(grib_accessor_data_g2simple_packing_with_preprocessing),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_data_g2simple_packing_with_preprocessing = &_grib_accessor_class_data_g2simple_packing_with_preprocessing;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    grib_accessor_data_g2simple_packing_with_preprocessing* self = (grib_accessor_data_g2simple_packing_with_preprocessing*)a;
-    self->pre_processing           = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
-    self->pre_processing_parameter = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
-    a->flags |= GRIB_ACCESSOR_FLAG_DATA;
-}
-
-static int value_count(grib_accessor* a, long* n_vals)
-{
-    grib_accessor_data_g2simple_packing_with_preprocessing* self = (grib_accessor_data_g2simple_packing_with_preprocessing*)a;
-    *n_vals = 0;
-
-    return grib_get_long_internal(grib_handle_of_accessor(a), self->number_of_values, n_vals);
-}
-
-static int pre_processing_func(double* values, long length, long pre_processing,
-                               double* pre_processing_parameter, int mode)
-{
-    int i = 0, ret  = 0;
-    double min      = values[0];
-    double next_min = values[0];
-    Assert(length > 0);
-
-    switch (pre_processing) {
-        /* NONE */
-        case 0:
-            break;
-        /* LOGARITHM */
-        case 1:
-            if (mode == DIRECT) {
-                for (i = 0; i < length; i++) {
-                    if (values[i] < min)
-                        min = values[i];
-                    if (values[i] > next_min)
-                        next_min = values[i];
-                }
-                for (i = 0; i < length; i++) {
-                    if (values[i] > min && values[i] < next_min)
-                        next_min = values[i];
-                }
-                if (min > 0) {
-                    *pre_processing_parameter = 0;
-                    for (i = 0; i < length; i++) {
-                        DEBUG_ASSERT(values[i] > 0);
-                        values[i] = log(values[i]);
-                    }
-                }
-                else {
-                    double ppp                = 0;
-                    *pre_processing_parameter = next_min - 2 * min;
-                    if (next_min == min)
-                        return ret;
-                    ppp = *pre_processing_parameter;
-                    for (i = 0; i < length; i++) {
-                        DEBUG_ASSERT((values[i] + ppp) > 0);
-                        values[i] = log(values[i] + ppp);
-                    }
-                }
-            }
-            else {
-                Assert(mode == INVERSE);
-                if (*pre_processing_parameter == 0) {
-                    for (i = 0; i < length; i++)
-                        values[i] = exp(values[i]);
-                }
-                else {
-                    for (i = 0; i < length; i++)
-                        values[i] = exp(values[i]) - *pre_processing_parameter;
-                }
-            }
-            break;
-        default:
-            ret = GRIB_NOT_IMPLEMENTED;
-            break;
-    }
-
-    return ret;
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_data_g2simple_packing_with_preprocessing* self = (grib_accessor_data_g2simple_packing_with_preprocessing*)a;
-    grib_accessor_class* super  = *(a->cclass->super);
-    grib_accessor_class* super2 = NULL;
-
-    size_t n_vals = 0;
-    long nn       = 0;
-    int err       = 0;
-
-    long pre_processing;
-    double pre_processing_parameter;
-
-    err    = grib_value_count(a, &nn);
-    n_vals = nn;
-    if (err)
-        return err;
-
-    if (n_vals == 0) {
-        *len = 0;
-        return GRIB_SUCCESS;
-    }
-
-    self->dirty = 0;
-
-    if ((err = grib_get_long_internal(grib_handle_of_accessor(a), self->pre_processing, &pre_processing)) != GRIB_SUCCESS) {
-        return err;
-    }
-
-    if ((err = grib_get_double_internal(grib_handle_of_accessor(a), self->pre_processing_parameter, &pre_processing_parameter)) != GRIB_SUCCESS) {
-        return err;
-    }
-
-    Assert(super->super);
-    super2 = *(super->super);
-    err    = super2->unpack_double(a, val, &n_vals); /* GRIB-364 */
-    if (err != GRIB_SUCCESS)
-        return err;
-
-    err = pre_processing_func(val, n_vals, pre_processing, &pre_processing_parameter, INVERSE);
-    if (err != GRIB_SUCCESS)
-        return err;
-
-    *len = (long)n_vals;
-
-    return err;
-}
-
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_data_g2simple_packing_with_preprocessing* self = (grib_accessor_data_g2simple_packing_with_preprocessing*)a;
-    grib_accessor_class* super                                   = *(a->cclass->super);
-
-    size_t n_vals = *len;
-    int err       = 0;
-
-    long pre_processing             = 0;
-    double pre_processing_parameter = 0;
-
-    self->dirty = 1;
-
-    if ((err = grib_get_long_internal(grib_handle_of_accessor(a), self->pre_processing, &pre_processing)) != GRIB_SUCCESS)
-        return err;
-
-    err = pre_processing_func((double*)val, n_vals, pre_processing, &pre_processing_parameter, DIRECT);
-    if (err != GRIB_SUCCESS)
-        return err;
-
-    err = super->pack_double(a, val, len);
-    if (err != GRIB_SUCCESS)
-        return err;
-
-    if ((err = grib_set_double_internal(grib_handle_of_accessor(a), self->pre_processing_parameter, pre_processing_parameter)) != GRIB_SUCCESS)
-        return err;
-
-    if ((err = grib_set_long_internal(grib_handle_of_accessor(a), self->number_of_values, n_vals)) != GRIB_SUCCESS)
-        return err;
-
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_data_raw_packing.cc b/src/accessor/todo/grib_accessor_class_data_raw_packing.cc
deleted file mode 100644
index 27c3d62e3..000000000
--- a/src/accessor/todo/grib_accessor_class_data_raw_packing.cc
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-/*****************************
- *  Enrico Fucile
- ****************************/
-
-#include "grib_ieeefloat.h"
-
-#define PRE_PROCESSING_NONE 0
-#define PRE_PROCESSING_DIFFERENCE 1
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_values
-   IMPLEMENTS = init
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = unpack_double_element;unpack_double_element_set
-   IMPLEMENTS = pack_double
-   IMPLEMENTS = value_count
-   MEMBERS=const char*   number_of_values
-   MEMBERS=const char*   precision
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static int unpack_double_element(grib_accessor*, size_t i, double* val);
-static int unpack_double_element_set(grib_accessor*, const size_t* index_array, size_t len, double* val_array);
-
-typedef struct grib_accessor_data_raw_packing
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in values */
-    int  carg;
-    const char* seclen;
-    const char* offsetdata;
-    const char* offsetsection;
-    int dirty;
-    /* Members defined in data_raw_packing */
-    const char*   number_of_values;
-    const char*   precision;
-} grib_accessor_data_raw_packing;
-
-extern grib_accessor_class* grib_accessor_class_values;
-
-static grib_accessor_class _grib_accessor_class_data_raw_packing = {
-    &grib_accessor_class_values,                      /* super */
-    "data_raw_packing",                      /* name */
-    sizeof(grib_accessor_data_raw_packing),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    &unpack_double_element,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    &unpack_double_element_set,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_data_raw_packing = &_grib_accessor_class_data_raw_packing;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    grib_accessor_data_raw_packing* self = (grib_accessor_data_raw_packing*)a;
-
-    self->number_of_values = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
-    self->precision        = grib_arguments_get_name(grib_handle_of_accessor(a), args, self->carg++);
-    a->flags |= GRIB_ACCESSOR_FLAG_DATA;
-}
-
-static int value_count(grib_accessor* a, long* n_vals)
-{
-    grib_accessor_data_raw_packing* self = (grib_accessor_data_raw_packing*)a;
-    *n_vals                              = 0;
-    return grib_get_long_internal(grib_handle_of_accessor(a), self->number_of_values, n_vals);
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_data_raw_packing* self = (grib_accessor_data_raw_packing*)a;
-    unsigned char* buf                   = NULL;
-    int bytes                            = 0;
-    size_t nvals                         = 0;
-    long inlen                           = grib_byte_count(a);
-
-    long precision = 0;
-
-    int code = GRIB_SUCCESS;
-
-    if ((code = grib_get_long(grib_handle_of_accessor(a), self->precision, &precision)) != GRIB_SUCCESS)
-        return code;
-
-    self->dirty = 0;
-
-    buf = (unsigned char*)grib_handle_of_accessor(a)->buffer->data;
-    buf += grib_byte_offset(a);
-
-    switch (precision) {
-        case 1:
-            bytes = 4;
-            break;
-        case 2:
-            bytes = 8;
-            break;
-        default:
-            return GRIB_NOT_IMPLEMENTED;
-    }
-
-    nvals = inlen / bytes;
-
-    if (*len < nvals)
-        return GRIB_ARRAY_TOO_SMALL;
-
-    code = grib_ieee_decode_array<double>(a->context, buf, nvals, bytes, val);
-
-    *len = nvals;
-
-    return code;
-}
-
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_data_raw_packing* self = (grib_accessor_data_raw_packing*)a;
-
-    int bytes             = 0;
-    unsigned char* buffer = NULL;
-
-    long precision = 0;
-
-    double* values = (double*)val;
-    size_t inlen   = *len;
-
-    /*int free_buffer = 0;
-     *int free_values = 0;*/
-
-    int code = GRIB_SUCCESS;
-
-    size_t bufsize = 0;
-
-    if (*len == 0)
-        return GRIB_NO_VALUES;
-
-    if ((code = grib_get_long_internal(grib_handle_of_accessor(a), self->precision, &precision)) != GRIB_SUCCESS)
-        return code;
-
-    self->dirty = 1;
-
-    switch (precision) {
-        case 1:
-            bytes = 4;
-            break;
-
-        case 2:
-            bytes = 8;
-            break;
-
-        default:
-            code = GRIB_NOT_IMPLEMENTED;
-            goto clean_up;
-    }
-
-    bufsize = bytes * inlen;
-
-    buffer = (unsigned char*)grib_context_malloc(a->context, bufsize);
-
-    if (!buffer) {
-        code = GRIB_OUT_OF_MEMORY;
-        goto clean_up;
-    }
-
-    code = grib_ieee_encode_array(a->context, values, inlen, bytes, buffer);
-
-clean_up:
-    /*if (free_buffer)
-     *  free(buffer);
-     * if (free_values)
-     *  free(values);
-    */
-
-    grib_buffer_replace(a, buffer, bufsize, 1, 1);
-
-    grib_context_buffer_free(a->context, buffer);
-
-    if (code == GRIB_SUCCESS) {
-        code = grib_set_long(grib_handle_of_accessor(a), self->number_of_values, inlen);
-        if (code == GRIB_READ_ONLY)
-            code = 0;
-    }
-
-    return code;
-}
-
-static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
-{
-    int ret                              = 0;
-    grib_accessor_data_raw_packing* self = (grib_accessor_data_raw_packing*)a;
-    unsigned char* buf                   = NULL;
-    int bytes                            = 0;
-    size_t nvals                         = 0;
-    long inlen                           = grib_byte_count(a);
-    long pos                             = 0;
-    long precision                       = 0;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->precision, &precision)) != GRIB_SUCCESS)
-        return ret;
-
-    self->dirty = 0;
-
-    buf = (unsigned char*)grib_handle_of_accessor(a)->buffer->data;
-    buf += grib_byte_offset(a);
-
-    switch (precision) {
-        case 1:
-            bytes = 4;
-            break;
-
-        case 2:
-            bytes = 8;
-            break;
-
-        default:
-            return GRIB_NOT_IMPLEMENTED;
-    }
-
-    pos = bytes * idx;
-
-    Assert(pos <= inlen);
-
-    nvals = 1;
-    buf += pos;
-
-    ret = grib_ieee_decode_array(a->context, buf, nvals, bytes, val);
-
-    return ret;
-}
-
-static int unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array)
-{
-    int err = 0;
-    size_t i = 0;
-    for (i=0; i<len; ++i) {
-        if ((err = unpack_double_element(a, index_array[i], val_array+i)) != GRIB_SUCCESS)
-            return err;
-    }
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_data_secondary_bitmap.cc b/src/accessor/todo/grib_accessor_class_data_secondary_bitmap.cc
deleted file mode 100644
index 06329aa92..000000000
--- a/src/accessor/todo/grib_accessor_class_data_secondary_bitmap.cc
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = init
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = dump;get_native_type
-   MEMBERS=const char*  primary_bitmap
-   MEMBERS=const char*  secondary_bitmap
-   MEMBERS=const char*  missing_value
-   MEMBERS=const char*  expand_by
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_data_secondary_bitmap
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in data_secondary_bitmap */
-    const char*  primary_bitmap;
-    const char*  secondary_bitmap;
-    const char*  missing_value;
-    const char*  expand_by;
-} grib_accessor_data_secondary_bitmap;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_data_secondary_bitmap = {
-    &grib_accessor_class_gen,                      /* super */
-    "data_secondary_bitmap",                      /* name */
-    sizeof(grib_accessor_data_secondary_bitmap),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_data_secondary_bitmap = &_grib_accessor_class_data_secondary_bitmap;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    grib_accessor_data_secondary_bitmap* self = (grib_accessor_data_secondary_bitmap*)a;
-    self->primary_bitmap                      = grib_arguments_get_name(grib_handle_of_accessor(a), args, 0);
-    self->secondary_bitmap                    = grib_arguments_get_name(grib_handle_of_accessor(a), args, 1);
-    self->missing_value                       = grib_arguments_get_name(grib_handle_of_accessor(a), args, 2);
-    self->expand_by                           = grib_arguments_get_name(grib_handle_of_accessor(a), args, 3);
-
-    a->length = 0;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    grib_dump_values(dumper, a);
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_data_secondary_bitmap* self = (grib_accessor_data_secondary_bitmap*)a;
-
-    size_t i       = 0;
-    size_t j       = 0;
-    size_t k       = 0;
-    size_t m       = 0;
-    size_t n_vals  = 0;
-    long nn        = 0;
-    long expand_by = 0;
-    int err        = 0;
-    size_t primary_len;
-    size_t secondary_len;
-    double* primary_vals;
-    double* secondary_vals;
-    err    = grib_value_count(a, &nn);
-    n_vals = nn;
-    if (err)
-        return err;
-
-    if (*len < n_vals) {
-        *len = n_vals;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    if ((err = grib_get_long(grib_handle_of_accessor(a), self->expand_by, &expand_by)) != GRIB_SUCCESS)
-        return err;
-
-    if ((err = grib_get_size(grib_handle_of_accessor(a), self->primary_bitmap, &primary_len)) != GRIB_SUCCESS)
-        return err;
-
-    if ((err = grib_get_size(grib_handle_of_accessor(a), self->secondary_bitmap, &secondary_len)) != GRIB_SUCCESS)
-        return err;
-
-    primary_vals = (double*)grib_context_malloc(a->context, primary_len * sizeof(double));
-    if (!primary_vals)
-        return GRIB_OUT_OF_MEMORY;
-
-    secondary_vals = (double*)grib_context_malloc(a->context, secondary_len * sizeof(double));
-    if (!secondary_vals) {
-        grib_context_free(a->context, primary_vals);
-        return GRIB_OUT_OF_MEMORY;
-    }
-
-    if ((err = grib_get_double_array_internal(grib_handle_of_accessor(a), self->primary_bitmap, primary_vals, &primary_len)) != GRIB_SUCCESS) {
-        grib_context_free(a->context, secondary_vals);
-        grib_context_free(a->context, primary_vals);
-        return err;
-    }
-
-    if ((err = grib_get_double_array_internal(grib_handle_of_accessor(a), self->secondary_bitmap, secondary_vals, &secondary_len)) != GRIB_SUCCESS) {
-        grib_context_free(a->context, secondary_vals);
-        grib_context_free(a->context, primary_vals);
-        return err;
-    }
-
-    k = 0;
-    m = 0;
-    for (i = 0; i < primary_len; i++) {
-        /* if(primary_vals[i]) f++; */
-        if (primary_vals[i]) {
-            for (j = 0; j < expand_by; j++)
-                val[k++] = secondary_vals[m++];
-        }
-        else {
-            for (j = 0; j < expand_by; j++)
-                val[k++] = 0;
-        }
-    }
-
-    Assert(k <= *len);
-    Assert(m <= secondary_len);
-
-    /*printf("FOOBAR %d %d %ld %d\n",f,primary_len,expand_by,n_vals);*/
-
-    *len = n_vals;
-
-    grib_context_free(a->context, primary_vals);
-    grib_context_free(a->context, secondary_vals);
-    return err;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    // grib_accessor_data_secondary_bitmap* self =  (grib_accessor_data_secondary_bitmap*)a;
-    //return grib_accessor_get_native_type(grib_find_accessor(grib_handle_of_accessor(a),self->coded_values));
-    return GRIB_TYPE_DOUBLE;
-}
diff --git a/src/accessor/todo/grib_accessor_class_data_shsimple_packing.cc b/src/accessor/todo/grib_accessor_class_data_shsimple_packing.cc
deleted file mode 100644
index d06743f8d..000000000
--- a/src/accessor/todo/grib_accessor_class_data_shsimple_packing.cc
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = init
-   IMPLEMENTS = pack_double
-   IMPLEMENTS = dump;get_native_type
-   MEMBERS=const char*  coded_values
-   MEMBERS=const char*  real_part
-   MEMBERS=int dirty
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_data_shsimple_packing
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in data_shsimple_packing */
-    const char*  coded_values;
-    const char*  real_part;
-    int dirty;
-} grib_accessor_data_shsimple_packing;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_data_shsimple_packing = {
-    &grib_accessor_class_gen,                      /* super */
-    "data_shsimple_packing",                      /* name */
-    sizeof(grib_accessor_data_shsimple_packing),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_data_shsimple_packing = &_grib_accessor_class_data_shsimple_packing;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    grib_accessor_data_shsimple_packing* self = (grib_accessor_data_shsimple_packing*)a;
-
-    self->coded_values = grib_arguments_get_name(grib_handle_of_accessor(a), args, 0);
-    self->real_part    = grib_arguments_get_name(grib_handle_of_accessor(a), args, 1);
-    a->flags |= GRIB_ACCESSOR_FLAG_DATA;
-
-    a->length = 0;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    grib_dump_values(dumper, a);
-}
-
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_data_shsimple_packing* self = (grib_accessor_data_shsimple_packing*)a;
-    int err                                   = GRIB_SUCCESS;
-
-    size_t coded_n_vals = *len - 1;
-    size_t n_vals       = *len;
-
-    self->dirty = 1;
-
-    if (*len == 0)
-        return GRIB_NO_VALUES;
-
-    if ((err = grib_set_double_internal(grib_handle_of_accessor(a), self->real_part, *val)) != GRIB_SUCCESS)
-        return err;
-
-    val++;
-
-    if ((err = grib_set_double_array_internal(grib_handle_of_accessor(a), self->coded_values, val, coded_n_vals)) != GRIB_SUCCESS)
-        return err;
-
-    *len = n_vals;
-
-    return err;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_DOUBLE;
-}
diff --git a/src/accessor/todo/grib_accessor_class_decimal_precision.cc b/src/accessor/todo/grib_accessor_class_decimal_precision.cc
deleted file mode 100644
index e498931b7..000000000
--- a/src/accessor/todo/grib_accessor_class_decimal_precision.cc
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/**********************************
- *  Enrico Fucile
- *********************************/
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long; pack_long
-   IMPLEMENTS = init
-   MEMBERS = const char* values
-   MEMBERS = const char* bits_per_value
-   MEMBERS = const char* changing_precision
-   MEMBERS = const char* decimal_scale_factor
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_decimal_precision
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in decimal_precision */
-    const char* values;
-    const char* bits_per_value;
-    const char* changing_precision;
-    const char* decimal_scale_factor;
-} grib_accessor_decimal_precision;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_decimal_precision = {
-    &grib_accessor_class_long,                      /* super */
-    "decimal_precision",                      /* name */
-    sizeof(grib_accessor_decimal_precision),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_decimal_precision = &_grib_accessor_class_decimal_precision;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* args)
-{
-    int n                                 = 0;
-    grib_accessor_decimal_precision* self = (grib_accessor_decimal_precision*)a;
-
-    self->bits_per_value       = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
-    self->decimal_scale_factor = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
-    self->changing_precision   = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
-    self->values               = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
-
-    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
-    a->length = 0;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    int ret                               = 0;
-    grib_accessor_decimal_precision* self = (grib_accessor_decimal_precision*)a;
-    grib_handle* h                        = grib_handle_of_accessor(a);
-
-    if ((ret = grib_get_long_internal(h, self->decimal_scale_factor, val)) != GRIB_SUCCESS)
-        return ret;
-
-    *len = 1;
-    return ret;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    long bitsPerValue                     = 0;
-    double* values                        = NULL;
-    size_t size                           = 0;
-    int ret                               = 0;
-    grib_accessor_decimal_precision* self = (grib_accessor_decimal_precision*)a;
-    grib_context* c                       = a->context;
-    grib_handle* h                        = grib_handle_of_accessor(a);
-
-    if (!self->values) {
-        if ((ret = grib_set_long_internal(h, self->bits_per_value, 0)) != GRIB_SUCCESS)
-            return ret;
-
-        if ((ret = grib_set_long_internal(h, self->decimal_scale_factor, *val)) != GRIB_SUCCESS)
-            return ret;
-
-        if ((ret = grib_set_long_internal(h, self->changing_precision, 1)) != GRIB_SUCCESS) {
-            grib_context_free(c, values);
-            return ret;
-        }
-
-        return GRIB_SUCCESS;
-    }
-
-    if ((ret = grib_get_size(h, self->values, &size)) != GRIB_SUCCESS)
-        return ret;
-
-    values = (double*)grib_context_malloc(c, size * sizeof(double));
-    if (!values)
-        return GRIB_OUT_OF_MEMORY;
-
-    if ((ret = grib_get_double_array_internal(h, self->values, values, &size)) != GRIB_SUCCESS) {
-        grib_context_buffer_free(c, values);
-        return ret;
-    }
-
-    if ((ret = grib_set_long_internal(h, self->decimal_scale_factor, *val)) != GRIB_SUCCESS) {
-        grib_context_buffer_free(c, values);
-        return ret;
-    }
-
-    if ((ret = grib_set_long_internal(h, self->bits_per_value, bitsPerValue)) != GRIB_SUCCESS) {
-        grib_context_free(c, values);
-        return ret;
-    }
-
-    if ((ret = grib_set_long_internal(h, self->changing_precision, 1)) != GRIB_SUCCESS) {
-        grib_context_free(c, values);
-        return ret;
-    }
-
-    if ((ret = grib_set_double_array_internal(h, self->values, values, size)) != GRIB_SUCCESS) {
-        grib_context_buffer_free(c, values);
-        return ret;
-    }
-
-    grib_context_free(c, values);
-
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_dirty.cc b/src/accessor/todo/grib_accessor_class_dirty.cc
deleted file mode 100644
index ec29923e3..000000000
--- a/src/accessor/todo/grib_accessor_class_dirty.cc
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/************************************
- *   Enrico Fucile
- **********************************/
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = pack_long
-   IMPLEMENTS = init
-   MEMBERS = const char* accessor
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_dirty
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in dirty */
-    const char* accessor;
-} grib_accessor_dirty;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_dirty = {
-    &grib_accessor_class_long,                      /* super */
-    "dirty",                      /* name */
-    sizeof(grib_accessor_dirty),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_dirty = &_grib_accessor_class_dirty;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_dirty* self = (grib_accessor_dirty*)a;
-    self->accessor            = grib_arguments_get_name(grib_handle_of_accessor(a), c, 0);
-    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
-    a->flags |= GRIB_ACCESSOR_FLAG_HIDDEN;
-    a->length = 0;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_dirty* self = (grib_accessor_dirty*)a;
-    grib_accessor* x          = grib_find_accessor(grib_handle_of_accessor(a), self->accessor);
-
-    if (x)
-        x->dirty = *val;
-
-    return GRIB_SUCCESS;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_dirty* self = (grib_accessor_dirty*)a;
-    grib_accessor* x          = grib_find_accessor(grib_handle_of_accessor(a), self->accessor);
-
-    if (x)
-        x->dirty = 1;
-
-    *val = 1;
-
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_divdouble.cc b/src/accessor/todo/grib_accessor_class_divdouble.cc
deleted file mode 100644
index 8ab86e22e..000000000
--- a/src/accessor/todo/grib_accessor_class_divdouble.cc
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_double
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = init
-   MEMBERS    = const char* val
-   MEMBERS    = double divisor
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_divdouble
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in divdouble */
-    const char* val;
-    double divisor;
-} grib_accessor_divdouble;
-
-extern grib_accessor_class* grib_accessor_class_double;
-
-static grib_accessor_class _grib_accessor_class_divdouble = {
-    &grib_accessor_class_double,                      /* super */
-    "divdouble",                      /* name */
-    sizeof(grib_accessor_divdouble),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_divdouble = &_grib_accessor_class_divdouble;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_divdouble* self = (grib_accessor_divdouble*)a;
-    int n = 0;
-
-    self->val     = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->divisor = grib_arguments_get_double(grib_handle_of_accessor(a), c, n++);
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    const grib_accessor_divdouble* self = (grib_accessor_divdouble*)a;
-    int ret = GRIB_SUCCESS;
-    double value = 0;
-
-    ret = grib_get_double_internal(grib_handle_of_accessor(a), self->val, &value);
-    if (ret != GRIB_SUCCESS)
-        return ret;
-
-    if (self->divisor == 0) {
-        return GRIB_INVALID_ARGUMENT;
-    }
-    *val = value / self->divisor;
-
-    *len = 1;
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_double.cc b/src/accessor/todo/grib_accessor_class_double.cc
deleted file mode 100644
index 3a2933aff..000000000
--- a/src/accessor/todo/grib_accessor_class_double.cc
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = get_native_type;unpack_string
-   IMPLEMENTS = pack_missing;
-   IMPLEMENTS = dump
-   IMPLEMENTS = compare
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_missing(grib_accessor*);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static void dump(grib_accessor*, grib_dumper*);
-static int compare(grib_accessor*, grib_accessor*);
-
-typedef struct grib_accessor_double
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-} grib_accessor_double;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_double = {
-    &grib_accessor_class_gen,                      /* super */
-    "double",                      /* name */
-    sizeof(grib_accessor_double),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    0,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    &pack_missing,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    &compare,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_double = &_grib_accessor_class_double;
-
-/* END_CLASS_IMP */
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_DOUBLE;
-}
-
-static int unpack_string(grib_accessor* a, char* v, size_t* len)
-{
-    double val = 0;
-    size_t l   = 1;
-    char repres[1024];
-    char format[32] = "%g";
-    grib_handle* h = grib_handle_of_accessor(a);
-    const char* cclass_name = a->cclass->name;
-
-    grib_unpack_double(a, &val, &l);
-
-    if ((val == GRIB_MISSING_DOUBLE) && ((a->flags & GRIB_ACCESSOR_FLAG_CAN_BE_MISSING) != 0)) {
-        snprintf(repres, sizeof(repres), "MISSING");
-    } else {
-        size_t size = sizeof(format);
-        grib_get_string(h, "formatForDoubles", format, &size);
-        snprintf(repres, sizeof(repres), format, val);
-    }
-
-    l = strlen(repres) + 1;
-
-    if (l > *len) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
-                         cclass_name, a->name, l, *len);
-        *len = l;
-        return GRIB_BUFFER_TOO_SMALL;
-    }
-    grib_context_log(a->context, GRIB_LOG_DEBUG, "grib_accessor_long: Casting double %s to string  ", a->name);
-
-    *len = l;
-
-    strcpy(v, repres);
-    return GRIB_SUCCESS;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    grib_dump_values(dumper, a);
-}
-
-static int compare(grib_accessor* a, grib_accessor* b)
-{
-    int retval   = 0;
-    double* aval = 0;
-    double* bval = 0;
-
-    size_t alen = 0;
-    size_t blen = 0;
-    long count  = 0;
-    int err     = 0;
-
-    err = grib_value_count(a, &count);
-    if (err)
-        return err;
-    alen = count;
-
-    err = grib_value_count(b, &count);
-    if (err)
-        return err;
-    blen = count;
-
-    if (alen != blen)
-        return GRIB_COUNT_MISMATCH;
-
-    aval = (double*)grib_context_malloc(a->context, alen * sizeof(double));
-    bval = (double*)grib_context_malloc(b->context, blen * sizeof(double));
-
-    grib_unpack_double(a, aval, &alen);
-    grib_unpack_double(b, bval, &blen);
-
-    retval = GRIB_SUCCESS;
-    while (alen != 0) {
-        if (*bval != *aval)
-            retval = GRIB_DOUBLE_VALUE_MISMATCH;
-        alen--;
-    }
-
-    grib_context_free(a->context, aval);
-    grib_context_free(b->context, bval);
-
-    return retval;
-}
-
-static int pack_missing(grib_accessor* a)
-{
-    size_t len   = 1;
-    double value = GRIB_MISSING_DOUBLE;
-
-    if (a->flags & GRIB_ACCESSOR_FLAG_CAN_BE_MISSING)
-        return grib_pack_double(a, &value, &len);
-    return GRIB_VALUE_CANNOT_BE_MISSING;
-}
diff --git a/src/accessor/todo/grib_accessor_class_evaluate.cc b/src/accessor/todo/grib_accessor_class_evaluate.cc
deleted file mode 100644
index 596b95884..000000000
--- a/src/accessor/todo/grib_accessor_class_evaluate.cc
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = init
-   MEMBERS= grib_arguments* arg
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_evaluate
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in evaluate */
-    grib_arguments* arg;
-} grib_accessor_evaluate;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_evaluate = {
-    &grib_accessor_class_long,                      /* super */
-    "evaluate",                      /* name */
-    sizeof(grib_accessor_evaluate),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_evaluate = &_grib_accessor_class_evaluate;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_evaluate* self = (grib_accessor_evaluate*)a;
-    self->arg                    = c;
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_evaluate* self = (grib_accessor_evaluate*)a;
-    grib_expression* e = grib_arguments_get_expression(grib_handle_of_accessor(a), self->arg, 0);
-
-    int ret  = grib_expression_evaluate_long(grib_handle_of_accessor(a), e, val);
-    *len = 1;
-
-    return ret;
-}
diff --git a/src/accessor/todo/grib_accessor_class_g1_half_byte_codeflag.cc b/src/accessor/todo/grib_accessor_class_g1_half_byte_codeflag.cc
deleted file mode 100644
index c275253e5..000000000
--- a/src/accessor/todo/grib_accessor_class_g1_half_byte_codeflag.cc
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = unpack_long;pack_long
-   IMPLEMENTS = init;dump
-   IMPLEMENTS = get_native_type
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_g1_half_byte_codeflag
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in g1_half_byte_codeflag */
-} grib_accessor_g1_half_byte_codeflag;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_g1_half_byte_codeflag = {
-    &grib_accessor_class_gen,                      /* super */
-    "g1_half_byte_codeflag",                      /* name */
-    sizeof(grib_accessor_g1_half_byte_codeflag),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_g1_half_byte_codeflag = &_grib_accessor_class_g1_half_byte_codeflag;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    a->length = 0;
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->flags |= GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    grib_dump_long(dumper, a, NULL);
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    unsigned char dat = 0;
-    if (*len < 1) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s it contains %d values ", a->name, 1);
-        *len = 0;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-    dat = grib_handle_of_accessor(a)->buffer->data[a->offset] & 0x0f;
-
-    *val = dat;
-    *len = 1;
-    return GRIB_SUCCESS;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    int ret = 0;
-    if (*len < 1) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s it contains %d values ", a->name, 1);
-        *len = 0;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-    /*  printf("HALF BYTE pack long %ld %02x\n",*val,grib_handle_of_accessor(a)->buffer->data[a->offset]);*/
-    grib_handle_of_accessor(a)->buffer->data[a->offset] = (a->parent->h->buffer->data[a->offset] & 0xf0) | (*val & 0x0f);
-    /*  printf("HALF BYTE pack long %ld %02x\n",*val,grib_handle_of_accessor(a)->buffer->data[a->offset]);*/
-
-    *len = 1;
-    return ret;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_LONG;
-}
diff --git a/src/accessor/todo/grib_accessor_class_g1_section4_length.cc b/src/accessor/todo/grib_accessor_class_g1_section4_length.cc
deleted file mode 100644
index 8e6c2b3f1..000000000
--- a/src/accessor/todo/grib_accessor_class_g1_section4_length.cc
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_section_length
-   IMPLEMENTS = init;unpack_long;pack_long
-   MEMBERS    = const char* total_length
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_g1_section4_length
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in unsigned */
-    long nbytes;
-    grib_arguments* arg;
-    /* Members defined in section_length */
-    /* Members defined in g1_section4_length */
-    const char* total_length;
-} grib_accessor_g1_section4_length;
-
-extern grib_accessor_class* grib_accessor_class_section_length;
-
-static grib_accessor_class _grib_accessor_class_g1_section4_length = {
-    &grib_accessor_class_section_length,                      /* super */
-    "g1_section4_length",                      /* name */
-    sizeof(grib_accessor_g1_section4_length),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_g1_section4_length = &_grib_accessor_class_g1_section4_length;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* args)
-{
-    grib_accessor_g1_section4_length* self = (grib_accessor_g1_section4_length*)a;
-    self->total_length                     = grib_arguments_get_name(grib_handle_of_accessor(a), args, 0);
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    // Old implementation:
-    //   Here we assume that the totalLength will be coded AFTER the section4 length, and
-    //   the section4 length will be overwritten by the totalLength accessor for large GRIBs
-    //    grib_accessor_class* super = *(a->cclass->super);
-    //    return super->pack_long(a,val,len);
-
-    // Note: Do not directly call pack_long on base class
-    // because in this special case we want to skip the checks.
-    // So we call the helper function which has an extra argument
-    return pack_long_unsigned_helper(a, val, len, /*check=*/0);
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_g1_section4_length* self = (grib_accessor_g1_section4_length*)a;
-    int ret = 0;
-    long total_length = 0, sec4_length = 0;
-
-    if ((ret = grib_get_g1_message_size(grib_handle_of_accessor(a),
-                                        grib_find_accessor(grib_handle_of_accessor(a), self->total_length),
-                                        a,
-                                        &total_length,
-                                        &sec4_length)) != GRIB_SUCCESS) {
-        return ret;
-    }
-
-    *val = sec4_length;
-
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_g1bitmap.cc b/src/accessor/todo/grib_accessor_class_g1bitmap.cc
deleted file mode 100644
index 519638f6a..000000000
--- a/src/accessor/todo/grib_accessor_class_g1bitmap.cc
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_bitmap
-   IMPLEMENTS = pack_double; unpack_bytes
-   IMPLEMENTS = value_count
-   IMPLEMENTS = init;
-   MEMBERS=const char* unusedBits
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_bytes(grib_accessor*, unsigned char*, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_g1bitmap
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in bytes */
-    /* Members defined in bitmap */
-    const char* tableReference;
-    const char* missing_value;
-    const char* offsetbsec;
-    const char* sLength;
-    /* Members defined in g1bitmap */
-    const char* unusedBits;
-} grib_accessor_g1bitmap;
-
-extern grib_accessor_class* grib_accessor_class_bitmap;
-
-static grib_accessor_class _grib_accessor_class_g1bitmap = {
-    &grib_accessor_class_bitmap,                      /* super */
-    "g1bitmap",                      /* name */
-    sizeof(grib_accessor_g1bitmap),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    &unpack_bytes,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_g1bitmap = &_grib_accessor_class_g1bitmap;
-
-/* END_CLASS_IMP */
-
-
-static void grib_set_bit_on(unsigned char* p, long* bitp);
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    grib_accessor_g1bitmap* self = (grib_accessor_g1bitmap*)a;
-    self->unusedBits             = grib_arguments_get_name(grib_handle_of_accessor(a), arg, 4);
-}
-
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_g1bitmap* self = (grib_accessor_g1bitmap*)a;
-    size_t tlen;
-
-    unsigned char* buf = NULL;
-    size_t i;
-    int err               = 0;
-    long pos              = 0;
-    //long bmaplen          = 0;
-    const int bit_padding = 16;
-    double miss_values    = 0;
-    tlen                  = ((*len + bit_padding - 1) / bit_padding * bit_padding) / 8;
-
-    if ((err = grib_get_double_internal(grib_handle_of_accessor(a), self->missing_value, &miss_values)) != GRIB_SUCCESS)
-        return err;
-
-    buf = (unsigned char*)grib_context_malloc_clear(a->context, tlen);
-    if (!buf)
-        return GRIB_OUT_OF_MEMORY;
-    pos = 0;
-    for (i = 0; i < *len; i++) {
-        if (val[i] == miss_values)
-            pos++;
-        else {
-            //bmaplen++;
-            grib_set_bit_on(buf, &pos);
-        }
-    }
-
-    if ((err = grib_set_long_internal(grib_handle_of_accessor(a), self->unusedBits, tlen * 8 - *len)) != GRIB_SUCCESS)
-        return err;
-
-    err = grib_buffer_replace(a, buf, tlen, 1, 1);
-    if (err) return err;
-
-    grib_context_free(a->context, buf);
-
-    return GRIB_SUCCESS;
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    grib_accessor_g1bitmap* self = (grib_accessor_g1bitmap*)a;
-    long tlen;
-    int err;
-
-    if ((err = grib_get_long_internal(grib_handle_of_accessor(a), self->unusedBits, &tlen)) != GRIB_SUCCESS)
-        grib_context_log(a->context, GRIB_LOG_ERROR, "grib_accessor_class_bitmap.value_count : cannot get %s err=%d", self->unusedBits, err);
-
-    *count = (a->length * 8) - tlen;
-    return err;
-}
-
-static int unpack_bytes(grib_accessor* a, unsigned char* val, size_t* len)
-{
-    unsigned char* buf           = grib_handle_of_accessor(a)->buffer->data;
-    grib_accessor_g1bitmap* self = (grib_accessor_g1bitmap*)a;
-    long tlen;
-    int err;
-    long length = grib_byte_count(a);
-    long offset = grib_byte_offset(a);
-
-    if (*len < (size_t)length) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s it is %ld bytes long\n", a->name, length);
-        *len = length;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    if ((err = grib_get_long_internal(grib_handle_of_accessor(a), self->unusedBits, &tlen)) != GRIB_SUCCESS)
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "grib_accessor_class_bitmap.unpack_bytes : cannot get %s err=%d", self->unusedBits, err);
-
-    length -= tlen / 8;
-    memcpy(val, buf + offset, length);
-    *len = length;
-
-    return GRIB_SUCCESS;
-}
-
-static void grib_set_bit_on(unsigned char* p, long* bitp)
-{
-    unsigned char o = 1;
-    p += (*bitp >> 3);
-    o <<= 7 - ((*bitp) % 8);
-    *p |= o;
-    (*bitp) += 1;
-}
diff --git a/src/accessor/todo/grib_accessor_class_g1day_of_the_year_date.cc b/src/accessor/todo/grib_accessor_class_g1day_of_the_year_date.cc
deleted file mode 100644
index 9028d5076..000000000
--- a/src/accessor/todo/grib_accessor_class_g1day_of_the_year_date.cc
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_g1date
-   IMPLEMENTS = unpack_string
-   IMPLEMENTS = dump
-   IMPLEMENTS = init
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_g1day_of_the_year_date
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in g1date */
-    const char* century;
-    const char* year;
-    const char* month;
-    const char* day;
-    /* Members defined in g1day_of_the_year_date */
-} grib_accessor_g1day_of_the_year_date;
-
-extern grib_accessor_class* grib_accessor_class_g1date;
-
-static grib_accessor_class _grib_accessor_class_g1day_of_the_year_date = {
-    &grib_accessor_class_g1date,                      /* super */
-    "g1day_of_the_year_date",                      /* name */
-    sizeof(grib_accessor_g1day_of_the_year_date),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_g1day_of_the_year_date = &_grib_accessor_class_g1day_of_the_year_date;
-
-/* END_CLASS_IMP */
-
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    grib_dump_string(dumper, a, NULL);
-}
-
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    /* special clim case where each mont have 30 days.. to comply with mars*/
-    grib_accessor_g1day_of_the_year_date* self = (grib_accessor_g1day_of_the_year_date*)a;
-    grib_handle* hand = grib_handle_of_accessor(a);
-    char tmp[1024];
-
-    long year    = 0;
-    long century = 0;
-    long month   = 0;
-    long day     = 0;
-    long fullyear = 0;
-    long fake_day_of_year = 0;
-
-    grib_get_long_internal(hand, self->century, &century);
-    grib_get_long_internal(hand, self->day, &day);
-    grib_get_long_internal(hand, self->month, &month);
-    grib_get_long_internal(hand, self->year, &year);
-
-    fullyear = ((century - 1) * 100 + year);
-    fake_day_of_year = ((month - 1) * 30) + day;
-    snprintf(tmp, sizeof(tmp), "%04ld-%03ld", fullyear, fake_day_of_year);
-
-    size_t l = strlen(tmp) + 1;
-    if (*len < l) {
-        *len = l;
-        return GRIB_BUFFER_TOO_SMALL;
-    }
-
-    *len = l;
-    strcpy(val, tmp);
-
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_g1end_of_interval_monthly.cc b/src/accessor/todo/grib_accessor_class_g1end_of_interval_monthly.cc
deleted file mode 100644
index cbf74322c..000000000
--- a/src/accessor/todo/grib_accessor_class_g1end_of_interval_monthly.cc
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_abstract_vector
-   IMPLEMENTS = unpack_double; destroy
-   IMPLEMENTS = value_count;compare
-   IMPLEMENTS = init
-   MEMBERS = const char* verifyingMonth
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void destroy(grib_context*, grib_accessor*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static int compare(grib_accessor*, grib_accessor*);
-
-typedef struct grib_accessor_g1end_of_interval_monthly
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in abstract_vector */
-    double* v;
-    int number_of_elements;
-    /* Members defined in g1end_of_interval_monthly */
-    const char* verifyingMonth;
-} grib_accessor_g1end_of_interval_monthly;
-
-extern grib_accessor_class* grib_accessor_class_abstract_vector;
-
-static grib_accessor_class _grib_accessor_class_g1end_of_interval_monthly = {
-    &grib_accessor_class_abstract_vector,                      /* super */
-    "g1end_of_interval_monthly",                      /* name */
-    sizeof(grib_accessor_g1end_of_interval_monthly),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    &destroy,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    &compare,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_g1end_of_interval_monthly = &_grib_accessor_class_g1end_of_interval_monthly;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_g1end_of_interval_monthly* self = (grib_accessor_g1end_of_interval_monthly*)a;
-    int n                                         = 0;
-
-    self->verifyingMonth = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
-    a->flags |= GRIB_ACCESSOR_FLAG_HIDDEN;
-
-    self->number_of_elements = 6;
-    self->v = (double*)grib_context_malloc(a->context, sizeof(double) * self->number_of_elements);
-
-    a->length = 0;
-    a->dirty  = 1;
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_g1end_of_interval_monthly* self = (grib_accessor_g1end_of_interval_monthly*)a;
-    int ret = 0;
-    char verifyingMonth[7] = {0,};
-    size_t slen = 7;
-    long year = 0, month = 0, date = 0;
-    const long mdays[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
-    long days    = 0;
-
-    if (!a->dirty)
-        return GRIB_SUCCESS;
-
-    if (*len != (size_t)self->number_of_elements)
-        return GRIB_ARRAY_TOO_SMALL;
-
-    if ((ret = grib_get_string(grib_handle_of_accessor(a), self->verifyingMonth, verifyingMonth, &slen)) != GRIB_SUCCESS)
-        return ret;
-
-    date  = atoi(verifyingMonth);
-    if (date < 0) {
-        return GRIB_INVALID_ARGUMENT;
-    }
-    year  = date / 100;
-    month = date - year * 100;
-    if (month == 2) {
-        days = 28;
-        if (year % 400 == 0 || (year % 4 == 0 && year % 100 != 0))
-            days = 29;
-    }
-    else {
-        if (month < 1 || month > 12) return GRIB_INVALID_ARGUMENT;
-        days = mdays[month - 1];
-    }
-    self->v[0] = year;
-    self->v[1] = month;
-
-    self->v[2] = days;
-    self->v[3] = 24;
-    self->v[4] = 00;
-    self->v[5] = 00;
-
-    a->dirty = 0;
-
-    val[0] = self->v[0];
-    val[1] = self->v[1];
-    val[2] = self->v[2];
-    val[3] = self->v[3];
-    val[4] = self->v[4];
-    val[5] = self->v[5];
-
-    return ret;
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    grib_accessor_g1end_of_interval_monthly* self = (grib_accessor_g1end_of_interval_monthly*)a;
-    *count                                        = self->number_of_elements;
-    return 0;
-}
-
-static void destroy(grib_context* c, grib_accessor* a)
-{
-    grib_accessor_g1end_of_interval_monthly* self = (grib_accessor_g1end_of_interval_monthly*)a;
-    grib_context_free(c, self->v);
-}
-
-static int compare(grib_accessor* a, grib_accessor* b)
-{
-    int retval   = GRIB_SUCCESS;
-    double* aval = 0;
-    double* bval = 0;
-
-    long count  = 0;
-    size_t alen = 0;
-    size_t blen = 0;
-    int err     = 0;
-
-    err = grib_value_count(a, &count);
-    if (err)
-        return err;
-    alen = count;
-
-    err = grib_value_count(b, &count);
-    if (err)
-        return err;
-    blen = count;
-
-    if (alen != blen)
-        return GRIB_COUNT_MISMATCH;
-
-    aval = (double*)grib_context_malloc(a->context, alen * sizeof(double));
-    bval = (double*)grib_context_malloc(b->context, blen * sizeof(double));
-
-    b->dirty = 1;
-    a->dirty = 1;
-
-    err = grib_unpack_double(a, aval, &alen); if(err) return err;
-    err = grib_unpack_double(b, bval, &blen); if(err) return err;
-
-    for(size_t i=0; i<alen && retval == GRIB_SUCCESS; ++i) {
-        if (aval[i] != bval[i]) retval = GRIB_DOUBLE_VALUE_MISMATCH;
-    }
-
-    grib_context_free(a->context, aval);
-    grib_context_free(b->context, bval);
-
-    return retval;
-}
diff --git a/src/accessor/todo/grib_accessor_class_g1fcperiod.cc b/src/accessor/todo/grib_accessor_class_g1fcperiod.cc
deleted file mode 100644
index 03aa6e3f4..000000000
--- a/src/accessor/todo/grib_accessor_class_g1fcperiod.cc
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_g1step_range
-   IMPLEMENTS = unpack_string
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_string(grib_accessor*, char*, size_t* len);
-
-typedef struct grib_accessor_g1fcperiod
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in abstract_long_vector */
-    long* v;
-    long pack_index;
-    int number_of_elements;
-    /* Members defined in g1step_range */
-    const char* p1;
-    const char* p2;
-    const char* timeRangeIndicator;
-    const char *unit;
-    const char *step_unit;
-    const char *stepType;
-    const char *patch_fp_precip;
-    int error_on_units;
-    /* Members defined in g1fcperiod */
-} grib_accessor_g1fcperiod;
-
-extern grib_accessor_class* grib_accessor_class_g1step_range;
-
-static grib_accessor_class _grib_accessor_class_g1fcperiod = {
-    &grib_accessor_class_g1step_range,                      /* super */
-    "g1fcperiod",                      /* name */
-    sizeof(grib_accessor_g1fcperiod),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    0,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_g1fcperiod = &_grib_accessor_class_g1fcperiod;
-
-/* END_CLASS_IMP */
-
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    long start = 0, theEnd = 0;
-    char tmp[1024];
-    const size_t tmpLen = sizeof(tmp);
-    int err  = grib_g1_step_get_steps(a, &start, &theEnd);
-    size_t l = 0;
-
-    if (err)
-        return err;
-
-    snprintf(tmp, tmpLen, "%ld-%ld", start / 24, theEnd / 24);
-    /*printf("---- FCPERIOD %s [start:%g, end:%g]",tmp,start,end);*/
-
-    l = strlen(tmp) + 1;
-    if (*len < l) {
-        *len = l;
-        return GRIB_BUFFER_TOO_SMALL;
-    }
-
-    *len = l;
-    strcpy(val, tmp); /* NOLINT: CWE-119 clang-analyzer-security.insecureAPI.strcpy */
-
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_g1monthlydate.cc b/src/accessor/todo/grib_accessor_class_g1monthlydate.cc
deleted file mode 100644
index 57c3ea729..000000000
--- a/src/accessor/todo/grib_accessor_class_g1monthlydate.cc
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-
-/***********************************************
- *   Enrico Fucile
- **********************************************/
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = init
-   MEMBERS=const char* date
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_g1monthlydate
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in g1monthlydate */
-    const char* date;
-} grib_accessor_g1monthlydate;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_g1monthlydate = {
-    &grib_accessor_class_long,                      /* super */
-    "g1monthlydate",                      /* name */
-    sizeof(grib_accessor_g1monthlydate),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_g1monthlydate = &_grib_accessor_class_g1monthlydate;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_g1monthlydate* self = (grib_accessor_g1monthlydate*)a;
-    int n                             = 0;
-
-    self->date = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_g1monthlydate* self = (grib_accessor_g1monthlydate*)a;
-
-    long date = 0;
-
-    grib_get_long_internal(grib_handle_of_accessor(a), self->date, &date);
-
-    date /= 100;
-    date *= 100;
-    date += 1;
-
-    *val = date;
-
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_g1number_of_coded_values_sh_complex.cc b/src/accessor/todo/grib_accessor_class_g1number_of_coded_values_sh_complex.cc
deleted file mode 100644
index 45b983502..000000000
--- a/src/accessor/todo/grib_accessor_class_g1number_of_coded_values_sh_complex.cc
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/******************************************************
- *  Enrico Fucile
- *******************************************************/
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = init
-   MEMBERS = const char* numberOfValues
-   MEMBERS = const char* bitsPerValue
-   MEMBERS = const char* offsetBeforeData
-   MEMBERS = const char* offsetAfterData
-   MEMBERS = const char* unusedBits
-   MEMBERS = const char* JS
-   MEMBERS = const char* KS
-   MEMBERS = const char* MS
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_g1number_of_coded_values_sh_complex
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in g1number_of_coded_values_sh_complex */
-    const char* numberOfValues;
-    const char* bitsPerValue;
-    const char* offsetBeforeData;
-    const char* offsetAfterData;
-    const char* unusedBits;
-    const char* JS;
-    const char* KS;
-    const char* MS;
-} grib_accessor_g1number_of_coded_values_sh_complex;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_g1number_of_coded_values_sh_complex = {
-    &grib_accessor_class_long,                      /* super */
-    "g1number_of_coded_values_sh_complex",                      /* name */
-    sizeof(grib_accessor_g1number_of_coded_values_sh_complex),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_g1number_of_coded_values_sh_complex = &_grib_accessor_class_g1number_of_coded_values_sh_complex;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    int n                                                   = 0;
-    grib_accessor_g1number_of_coded_values_sh_complex* self = (grib_accessor_g1number_of_coded_values_sh_complex*)a;
-    self->bitsPerValue                                      = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->offsetBeforeData                                  = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->offsetAfterData                                   = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->unusedBits                                        = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->numberOfValues                                    = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->JS                                                = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->KS                                                = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->MS                                                = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
-    a->length = 0;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    int ret               = GRIB_SUCCESS;
-    long bpv              = 0;
-    long offsetBeforeData = 0, offsetAfterData = 0, unusedBits = 0, numberOfValues;
-    long JS = 0, KS = 0, MS = 0, NS = 0;
-
-    grib_accessor_g1number_of_coded_values_sh_complex* self = (grib_accessor_g1number_of_coded_values_sh_complex*)a;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->bitsPerValue, &bpv)) != GRIB_SUCCESS)
-        return ret;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->offsetBeforeData, &offsetBeforeData)) != GRIB_SUCCESS)
-        return ret;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->offsetAfterData, &offsetAfterData)) != GRIB_SUCCESS)
-        return ret;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->unusedBits, &unusedBits)) != GRIB_SUCCESS)
-        return ret;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->JS, &JS)) != GRIB_SUCCESS)
-        return ret;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->KS, &KS)) != GRIB_SUCCESS)
-        return ret;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->MS, &MS)) != GRIB_SUCCESS)
-        return ret;
-
-    if (JS != KS || KS != MS)
-        return GRIB_NOT_IMPLEMENTED;
-
-    NS = (MS + 1) * (MS + 2);
-
-    if (bpv != 0) {
-        DEBUG_ASSERT(offsetAfterData > offsetBeforeData);
-        *val = ((offsetAfterData - offsetBeforeData) * 8 - unusedBits + NS * (bpv - 32)) / bpv;
-    }
-    else {
-        if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->numberOfValues, &numberOfValues)) != GRIB_SUCCESS)
-            return ret;
-
-        *val = numberOfValues;
-    }
-
-    return ret;
-}
diff --git a/src/accessor/todo/grib_accessor_class_g1number_of_coded_values_sh_simple.cc b/src/accessor/todo/grib_accessor_class_g1number_of_coded_values_sh_simple.cc
deleted file mode 100644
index 532a4c5dd..000000000
--- a/src/accessor/todo/grib_accessor_class_g1number_of_coded_values_sh_simple.cc
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/**********************************************
- *   Enrico Fucile
- **********************************************/
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = init
-   MEMBERS = const char* numberOfValues
-   MEMBERS = const char* bitsPerValue
-   MEMBERS = const char* offsetBeforeData
-   MEMBERS = const char* offsetAfterData
-   MEMBERS = const char* unusedBits
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_g1number_of_coded_values_sh_simple
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in g1number_of_coded_values_sh_simple */
-    const char* numberOfValues;
-    const char* bitsPerValue;
-    const char* offsetBeforeData;
-    const char* offsetAfterData;
-    const char* unusedBits;
-} grib_accessor_g1number_of_coded_values_sh_simple;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_g1number_of_coded_values_sh_simple = {
-    &grib_accessor_class_long,                      /* super */
-    "g1number_of_coded_values_sh_simple",                      /* name */
-    sizeof(grib_accessor_g1number_of_coded_values_sh_simple),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_g1number_of_coded_values_sh_simple = &_grib_accessor_class_g1number_of_coded_values_sh_simple;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    int n                                                  = 0;
-    grib_accessor_g1number_of_coded_values_sh_simple* self = (grib_accessor_g1number_of_coded_values_sh_simple*)a;
-    self->bitsPerValue                                     = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->offsetBeforeData                                 = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->offsetAfterData                                  = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->unusedBits                                       = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->numberOfValues                                   = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
-    a->length = 0;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    int ret               = GRIB_SUCCESS;
-    long bpv              = 0;
-    long offsetBeforeData = 0, offsetAfterData = 0, unusedBits = 0, numberOfValues;
-
-    grib_accessor_g1number_of_coded_values_sh_simple* self = (grib_accessor_g1number_of_coded_values_sh_simple*)a;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->bitsPerValue, &bpv)) != GRIB_SUCCESS)
-        return ret;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->offsetBeforeData, &offsetBeforeData)) != GRIB_SUCCESS)
-        return ret;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->offsetAfterData, &offsetAfterData)) != GRIB_SUCCESS)
-        return ret;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->unusedBits, &unusedBits)) != GRIB_SUCCESS)
-        return ret;
-
-    if (bpv != 0) {
-        DEBUG_ASSERT(offsetAfterData > offsetBeforeData);
-        *val = ((offsetAfterData - offsetBeforeData) * 8 - unusedBits) / bpv;
-    }
-    else {
-        if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->numberOfValues, &numberOfValues)) != GRIB_SUCCESS)
-            return ret;
-
-        *val = numberOfValues;
-    }
-    return ret;
-}
diff --git a/src/accessor/todo/grib_accessor_class_g1verificationdate.cc b/src/accessor/todo/grib_accessor_class_g1verificationdate.cc
deleted file mode 100644
index 03c871617..000000000
--- a/src/accessor/todo/grib_accessor_class_g1verificationdate.cc
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = init
-   MEMBERS=const char* date
-   MEMBERS=const char* time
-   MEMBERS=const char* step
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_g1verificationdate
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in g1verificationdate */
-    const char* date;
-    const char* time;
-    const char* step;
-} grib_accessor_g1verificationdate;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_g1verificationdate = {
-    &grib_accessor_class_long,                      /* super */
-    "g1verificationdate",                      /* name */
-    sizeof(grib_accessor_g1verificationdate),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_g1verificationdate = &_grib_accessor_class_g1verificationdate;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_g1verificationdate* self = (grib_accessor_g1verificationdate*)a;
-    int n                                  = 0;
-
-    self->date = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->time = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->step = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_g1verificationdate* self = (grib_accessor_g1verificationdate*)a;
-    int ret                                = 0;
-    long date                              = 0;
-    long time                              = 0;
-    long cdate                             = 0;
-    long step                              = 0;
-    long vtime                             = 0;
-    long vdate                             = 0;
-    long vd                                = 0;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->date, &date)) != GRIB_SUCCESS)
-        return ret;
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->time, &time)) != GRIB_SUCCESS)
-        return ret;
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->step, &step)) != GRIB_SUCCESS)
-        return ret;
-
-    time /= 100;
-
-    cdate = (long)grib_date_to_julian(date);
-    vtime = cdate * 24 + time + step;
-    vd    = vtime / 24;
-    vdate = grib_julian_to_date(vd);
-
-    /* printf("\n********\n date %d, time %d, step %d, vdate: %d, cdate %d, vd %d\n********\n", date, time, step, vdate, cdate, vd);    */
-
-    if (*len < 1)
-        return GRIB_ARRAY_TOO_SMALL;
-
-    *val = vdate;
-
-    /* fprintf(stdout,"\n********\n %d cdate %d vd %d\n********\n", vdate, cdate, step); */
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_g2_aerosol.cc b/src/accessor/todo/grib_accessor_class_g2_aerosol.cc
deleted file mode 100644
index 7cd8659df..000000000
--- a/src/accessor/todo/grib_accessor_class_g2_aerosol.cc
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_unsigned
-   IMPLEMENTS = unpack_long;pack_long; value_count
-   IMPLEMENTS = init
-   MEMBERS=const char* productDefinitionTemplateNumber
-   MEMBERS=const char* stepType
-   MEMBERS=int optical
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_g2_aerosol
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in unsigned */
-    long nbytes;
-    grib_arguments* arg;
-    /* Members defined in g2_aerosol */
-    const char* productDefinitionTemplateNumber;
-    const char* stepType;
-    int optical;
-} grib_accessor_g2_aerosol;
-
-extern grib_accessor_class* grib_accessor_class_unsigned;
-
-static grib_accessor_class _grib_accessor_class_g2_aerosol = {
-    &grib_accessor_class_unsigned,                      /* super */
-    "g2_aerosol",                      /* name */
-    sizeof(grib_accessor_g2_aerosol),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_g2_aerosol = &_grib_accessor_class_g2_aerosol;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_g2_aerosol* self = (grib_accessor_g2_aerosol*)a;
-    grib_handle* hand              = grib_handle_of_accessor(a);
-    int n                          = 0;
-
-    self->productDefinitionTemplateNumber = grib_arguments_get_name(hand, c, n++);
-    self->stepType                        = grib_arguments_get_name(hand, c, n++);
-    self->optical                         = grib_arguments_get_long(hand, c, n++);
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_g2_aerosol* self       = (grib_accessor_g2_aerosol*)a;
-    long productDefinitionTemplateNumber = 0;
-    grib_get_long(grib_handle_of_accessor(a), self->productDefinitionTemplateNumber, &productDefinitionTemplateNumber);
-
-    if (self->optical)
-        *val = grib2_is_PDTN_AerosolOptical(productDefinitionTemplateNumber);
-    else
-        *val = grib2_is_PDTN_Aerosol(productDefinitionTemplateNumber);
-
-    return GRIB_SUCCESS;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_g2_aerosol* self          = (grib_accessor_g2_aerosol*)a;
-    grib_handle* hand                       = grib_handle_of_accessor(a);
-    long productDefinitionTemplateNumber    = -1;
-    long productDefinitionTemplateNumberNew = -1;
-    /*long type=-1;
-    long stream=-1;*/
-    long eps          = -1;
-    char stepType[15] = {0,};
-    size_t slen = 15;
-    /*int aerosol = *val;*/
-    int isInstant = 0;
-    /*long derivedForecast=-1;*/
-    int ret = 0;
-
-    if (grib_get_long(hand, self->productDefinitionTemplateNumber, &productDefinitionTemplateNumber) != GRIB_SUCCESS)
-        return GRIB_SUCCESS;
-
-    /*
-     grib_get_long(hand, self->type,&type);
-     grib_get_long(hand, self->stream,&stream);
-     */
-    ret = grib_get_string(hand, self->stepType, stepType, &slen);
-    Assert(ret == GRIB_SUCCESS);
-
-    //eps = grib2_is_PDTN_EPS(productDefinitionTemplateNumber);
-    eps = grib_is_defined(hand, "perturbationNumber");
-
-    if (!strcmp(stepType, "instant"))
-        isInstant = 1;
-
-    if (eps == 1) {
-        if (isInstant) {
-            productDefinitionTemplateNumberNew = 45;
-        }
-        else {
-            /*productDefinitionTemplateNumberNew = 47; PDT deprecated*/
-            productDefinitionTemplateNumberNew = 85;
-        }
-    }
-    else {
-        if (isInstant) {
-            productDefinitionTemplateNumberNew = 48; /*44 is deprecated*/
-        }
-        else {
-            productDefinitionTemplateNumberNew = 46;
-        }
-    }
-
-    if (self->optical) {
-        /* Note: There is no interval based template for optical properties of aerosol! */
-        if (eps)
-            productDefinitionTemplateNumberNew = 49;
-        else
-            productDefinitionTemplateNumberNew = 48;
-        if (!isInstant) {
-            grib_context_log(hand->context, GRIB_LOG_ERROR,
-                             "The product definition templates for optical properties of aerosol are for a point-in-time only");
-        }
-    }
-
-    if (productDefinitionTemplateNumber != productDefinitionTemplateNumberNew) {
-        grib_set_long(hand, self->productDefinitionTemplateNumber, productDefinitionTemplateNumberNew);
-        /*if (derivedForecast>=0) grib_set_long(hand, self->derivedForecast,derivedForecast);*/
-    }
-
-    return 0;
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    *count = 1;
-    return 0;
-}
diff --git a/src/accessor/todo/grib_accessor_class_g2bitmap.cc b/src/accessor/todo/grib_accessor_class_g2bitmap.cc
deleted file mode 100644
index 441ad70a6..000000000
--- a/src/accessor/todo/grib_accessor_class_g2bitmap.cc
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_bitmap
-   IMPLEMENTS = pack_double
-   IMPLEMENTS = value_count
-   IMPLEMENTS = init;
-   MEMBERS=const char* numberOfValues
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_g2bitmap
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in bytes */
-    /* Members defined in bitmap */
-    const char* tableReference;
-    const char* missing_value;
-    const char* offsetbsec;
-    const char* sLength;
-    /* Members defined in g2bitmap */
-    const char* numberOfValues;
-} grib_accessor_g2bitmap;
-
-extern grib_accessor_class* grib_accessor_class_bitmap;
-
-static grib_accessor_class _grib_accessor_class_g2bitmap = {
-    &grib_accessor_class_bitmap,                      /* super */
-    "g2bitmap",                      /* name */
-    sizeof(grib_accessor_g2bitmap),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_g2bitmap = &_grib_accessor_class_g2bitmap;
-
-/* END_CLASS_IMP */
-
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    grib_accessor_g2bitmap* self = (grib_accessor_g2bitmap*)a;
-
-    self->numberOfValues = grib_arguments_get_name(grib_handle_of_accessor(a), arg, 4);
-}
-
-
-static void grib_set_bit_on(unsigned char* p, long* bitp)
-{
-    unsigned char o = 1;
-    p += (*bitp >> 3);
-    o <<= 7 - ((*bitp) % 8);
-    *p |= o;
-    (*bitp) += 1;
-}
-
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_g2bitmap* self = (grib_accessor_g2bitmap*)a;
-
-    size_t tlen;
-
-    unsigned char* buf = NULL;
-    size_t i;
-    int err            = 0;
-    long pos           = 0;
-    // long bmaplen       = 0;
-    double miss_values = 0;
-    tlen               = (*len + 7) / 8;
-
-    if ((err = grib_get_double_internal(grib_handle_of_accessor(a), self->missing_value, &miss_values)) != GRIB_SUCCESS)
-        return err;
-
-    buf = (unsigned char*)grib_context_malloc_clear(a->context, tlen);
-    if (!buf)
-        return GRIB_OUT_OF_MEMORY;
-    pos = 0;
-    for (i = 0; i < *len; i++) {
-        if (val[i] == miss_values)
-            pos++;
-        else {
-            // bmaplen++;
-            grib_set_bit_on(buf, &pos);
-        }
-    }
-
-    if ((err = grib_set_long_internal(grib_handle_of_accessor(a), self->numberOfValues, *len)) != GRIB_SUCCESS) {
-        grib_context_free(a->context, buf);
-        return err;
-    }
-
-    grib_buffer_replace(a, buf, tlen, 1, 1);
-
-    grib_context_free(a->context, buf);
-
-    return GRIB_SUCCESS;
-}
-
-
-static int value_count(grib_accessor* a, long* tlen)
-{
-    grib_accessor_g2bitmap* self = (grib_accessor_g2bitmap*)a;
-    int err;
-    *tlen = 0;
-
-    err = grib_get_long_internal(grib_handle_of_accessor(a), self->numberOfValues, tlen);
-    return err;
-}
diff --git a/src/accessor/todo/grib_accessor_class_g2bitmap_present.cc b/src/accessor/todo/grib_accessor_class_g2bitmap_present.cc
deleted file mode 100644
index 52378d4eb..000000000
--- a/src/accessor/todo/grib_accessor_class_g2bitmap_present.cc
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/****************************************
- * Enrico Fucile
- *************************************/
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = pack_long
-   IMPLEMENTS = init
-   MEMBERS = const char* bitmapIndicator
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_g2bitmap_present
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in g2bitmap_present */
-    const char* bitmapIndicator;
-} grib_accessor_g2bitmap_present;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_g2bitmap_present = {
-    &grib_accessor_class_long,                      /* super */
-    "g2bitmap_present",                      /* name */
-    sizeof(grib_accessor_g2bitmap_present),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_g2bitmap_present = &_grib_accessor_class_g2bitmap_present;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    int n                                = 0;
-    grib_accessor_g2bitmap_present* self = (grib_accessor_g2bitmap_present*)a;
-    self->bitmapIndicator                = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-
-    a->length = 0;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    int ret              = GRIB_SUCCESS;
-    long bitmapIndicator = 0;
-
-    grib_accessor_g2bitmap_present* self = (grib_accessor_g2bitmap_present*)a;
-
-    ret = grib_get_long_internal(grib_handle_of_accessor(a), self->bitmapIndicator, &bitmapIndicator);
-    if (ret) {
-        if (ret == GRIB_NOT_FOUND) {
-            *val = 0;
-            return 0;
-        }
-        else
-            return ret;
-    }
-
-    *val = 1;
-    if (bitmapIndicator == 255)
-        *val = 0;
-
-    *len = 1;
-    return ret;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_g2bitmap_present* self = (grib_accessor_g2bitmap_present*)a;
-    long bitmapIndicator                 = 0;
-
-    if (*val == 0)
-        bitmapIndicator = 255;
-
-    return grib_set_long(grib_handle_of_accessor(a), self->bitmapIndicator, bitmapIndicator);
-}
diff --git a/src/accessor/todo/grib_accessor_class_g2date.cc b/src/accessor/todo/grib_accessor_class_g2date.cc
deleted file mode 100644
index 698cd4a26..000000000
--- a/src/accessor/todo/grib_accessor_class_g2date.cc
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long;pack_long;init
-   MEMBERS=const char* century
-   MEMBERS=const char* year
-   MEMBERS=const char* month
-   MEMBERS=const char* day
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_g2date
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in g2date */
-    const char* century;
-    const char* year;
-    const char* month;
-    const char* day;
-} grib_accessor_g2date;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_g2date = {
-    &grib_accessor_class_long,                      /* super */
-    "g2date",                      /* name */
-    sizeof(grib_accessor_g2date),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_g2date = &_grib_accessor_class_g2date;
-
-/* END_CLASS_IMP */
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_g2date* self = (grib_accessor_g2date*)a;
-    int n                      = 0;
-
-    self->year  = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->month = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->day   = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    const grib_accessor_g2date* self = (grib_accessor_g2date*)a;
-
-    int ret = 0;
-    long year  = 0;
-    long month = 0;
-    long day   = 0;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->day, &day)) != GRIB_SUCCESS)
-        return ret;
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->month, &month)) != GRIB_SUCCESS)
-        return ret;
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->year, &year)) != GRIB_SUCCESS)
-        return ret;
-
-    if (*len < 1)
-        return GRIB_WRONG_ARRAY_SIZE;
-
-    val[0] = year * 10000 + month * 100 + day;
-
-    return GRIB_SUCCESS;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    const grib_accessor_g2date* self = (grib_accessor_g2date*)a;
-
-    int ret = GRIB_SUCCESS;
-    long v = val[0];
-    long year  = 0;
-    long month = 0;
-    long day   = 0;
-
-    if (*len != 1)
-        return GRIB_WRONG_ARRAY_SIZE;
-
-    year = v / 10000;
-    v %= 10000;
-    month = v / 100;
-    v %= 100;
-    day = v;
-
-    if (!is_date_valid(year, month, day, 0, 0, 0)) {
-        // ECC-1777: For now just a warning. Will later change to an error
-        fprintf(stderr, "ECCODES WARNING :  %s:%s: Date is not valid! year=%ld month=%ld day=%ld\n",
-                a->cclass->name, __func__, year, month, day);
-    }
-
-    if ((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->day, day)) != GRIB_SUCCESS)
-        return ret;
-    if ((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->month, month)) != GRIB_SUCCESS)
-        return ret;
-    if ((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->year, year)) != GRIB_SUCCESS)
-        return ret;
-
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_g2latlon.cc b/src/accessor/todo/grib_accessor_class_g2latlon.cc
deleted file mode 100644
index 5549b79a3..000000000
--- a/src/accessor/todo/grib_accessor_class_g2latlon.cc
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/********************************************
- *  Enrico Fucile
- *********************************************/
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_double
-   IMPLEMENTS = unpack_double;pack_double
-   IMPLEMENTS = is_missing;pack_missing
-   IMPLEMENTS = init
-   MEMBERS=const char*                  grid
-   MEMBERS=int                          index
-   MEMBERS=const char*                  given
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_missing(grib_accessor*);
-static int is_missing(grib_accessor*);
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_g2latlon
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in g2latlon */
-    const char*                  grid;
-    int                          index;
-    const char*                  given;
-} grib_accessor_g2latlon;
-
-extern grib_accessor_class* grib_accessor_class_double;
-
-static grib_accessor_class _grib_accessor_class_g2latlon = {
-    &grib_accessor_class_double,                      /* super */
-    "g2latlon",                      /* name */
-    sizeof(grib_accessor_g2latlon),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    &pack_missing,               /* pack_missing */
-    &is_missing,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_g2latlon = &_grib_accessor_class_g2latlon;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_g2latlon* self = (grib_accessor_g2latlon*)a;
-    int n                        = 0;
-
-    self->grid  = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->index = grib_arguments_get_long(grib_handle_of_accessor(a), c, n++);
-    self->given = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_g2latlon* self = (grib_accessor_g2latlon*)a;
-    int ret                      = 0;
-
-    long given = 1;
-    double grid[6];
-    size_t size = 6;
-
-    if (*len < 1) {
-        ret = GRIB_ARRAY_TOO_SMALL;
-        return ret;
-    }
-
-    if (self->given)
-        if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->given, &given)) != GRIB_SUCCESS)
-            return ret;
-
-    if (!given) {
-        *val = GRIB_MISSING_DOUBLE;
-        return GRIB_SUCCESS;
-    }
-
-    if ((ret = grib_get_double_array_internal(grib_handle_of_accessor(a), self->grid, grid, &size)) != GRIB_SUCCESS)
-        return ret;
-
-    *val = grid[self->index];
-
-    return GRIB_SUCCESS;
-}
-
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_g2latlon* self = (grib_accessor_g2latlon*)a;
-    int ret                      = 0;
-    double grid[6];
-    size_t size    = 6;
-    double new_val = *val;
-    grib_handle* hand = grib_handle_of_accessor(a);
-
-    if (*len < 1) {
-        ret = GRIB_ARRAY_TOO_SMALL;
-        return ret;
-    }
-
-    if (self->given) {
-        long given = *val != GRIB_MISSING_DOUBLE;
-        if ((ret = grib_set_long_internal(hand, self->given, given)) != GRIB_SUCCESS)
-            return ret;
-    }
-
-    if ((ret = grib_get_double_array_internal(hand, self->grid, grid, &size)) != GRIB_SUCCESS)
-        return ret;
-
-    /* index 1 is longitudeOfFirstGridPointInDegrees
-     * index 3 is longitudeOfLastGridPointInDegrees
-     */
-    if ((self->index == 1 || self->index == 3)) {
-        /* WMO regulation for GRIB edition 2:
-         * The longitude values shall be limited to the range 0 to 360 degrees inclusive */
-        new_val = normalise_longitude_in_degrees(*val);
-        if (hand->context->debug && new_val != *val) {
-            fprintf(stderr, "ECCODES DEBUG pack_double g2latlon: normalise longitude %g -> %g\n", *val, new_val);
-        }
-    }
-    grid[self->index] = new_val;
-
-    return grib_set_double_array_internal(hand, self->grid, grid, size);
-}
-
-static int pack_missing(grib_accessor* a)
-{
-    grib_accessor_g2latlon* self = (grib_accessor_g2latlon*)a;
-    double missing               = GRIB_MISSING_DOUBLE;
-    size_t size                  = 1;
-
-    if (!self->given)
-        return GRIB_NOT_IMPLEMENTED;
-
-    return pack_double(a, &missing, &size);
-}
-
-static int is_missing(grib_accessor* a)
-{
-    grib_accessor_g2latlon* self = (grib_accessor_g2latlon*)a;
-    long given                   = 1;
-
-    if (self->given)
-        grib_get_long_internal(grib_handle_of_accessor(a), self->given, &given);
-
-    return !given;
-}
diff --git a/src/accessor/todo/grib_accessor_class_g2lon.cc b/src/accessor/todo/grib_accessor_class_g2lon.cc
deleted file mode 100644
index c84776915..000000000
--- a/src/accessor/todo/grib_accessor_class_g2lon.cc
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/********************************************
- *  Enrico Fucile
- *********************************************/
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_double
-   IMPLEMENTS = unpack_double;pack_double
-   IMPLEMENTS = init
-   MEMBERS=const char* longitude
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_g2lon
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in g2lon */
-    const char* longitude;
-} grib_accessor_g2lon;
-
-extern grib_accessor_class* grib_accessor_class_double;
-
-static grib_accessor_class _grib_accessor_class_g2lon = {
-    &grib_accessor_class_double,                      /* super */
-    "g2lon",                      /* name */
-    sizeof(grib_accessor_g2lon),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_g2lon = &_grib_accessor_class_g2lon;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_g2lon* self = (grib_accessor_g2lon*)a;
-    int n                     = 0;
-
-    self->longitude = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_g2lon* self = (grib_accessor_g2lon*)a;
-    int ret                   = 0;
-    long longitude;
-
-    if ((ret = grib_get_long(grib_handle_of_accessor(a), self->longitude, &longitude)) != GRIB_SUCCESS)
-        return ret;
-
-    if (longitude == GRIB_MISSING_LONG) {
-        *val = GRIB_MISSING_DOUBLE;
-        return GRIB_SUCCESS;
-    }
-
-    *val = ((double)longitude) / 1000000.0;
-
-    return GRIB_SUCCESS;
-}
-
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_g2lon* self = (grib_accessor_g2lon*)a;
-    long longitude;
-    double value = *val;
-
-    if (value == GRIB_MISSING_DOUBLE) {
-        longitude = GRIB_MISSING_LONG;
-    }
-    else {
-        if (value < 0)
-            value += 360;
-        longitude = (long)(value * 1000000);
-    }
-    return grib_set_long(grib_handle_of_accessor(a), self->longitude, longitude);
-}
diff --git a/src/accessor/todo/grib_accessor_class_gaussian_grid_name.cc b/src/accessor/todo/grib_accessor_class_gaussian_grid_name.cc
deleted file mode 100644
index 21117d4f1..000000000
--- a/src/accessor/todo/grib_accessor_class_gaussian_grid_name.cc
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = init;unpack_string; get_native_type;string_length
-   MEMBERS = const char* N
-   MEMBERS = const char* Ni
-   MEMBERS = const char* isOctahedral
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static size_t string_length(grib_accessor*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_gaussian_grid_name
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in gaussian_grid_name */
-    const char* N;
-    const char* Ni;
-    const char* isOctahedral;
-} grib_accessor_gaussian_grid_name;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_gaussian_grid_name = {
-    &grib_accessor_class_gen,                      /* super */
-    "gaussian_grid_name",                      /* name */
-    sizeof(grib_accessor_gaussian_grid_name),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    &string_length,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_gaussian_grid_name = &_grib_accessor_class_gaussian_grid_name;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    grib_accessor_gaussian_grid_name* self = (grib_accessor_gaussian_grid_name*)a;
-    int n                                  = 0;
-
-    self->N            = grib_arguments_get_name(a->parent->h, arg, n++);
-    self->Ni           = grib_arguments_get_name(a->parent->h, arg, n++);
-    self->isOctahedral = grib_arguments_get_name(a->parent->h, arg, n++);
-    a->length          = 0;
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->flags |= GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_STRING;
-}
-
-#define MAX_GRIDNAME_LEN 16
-
-static int unpack_string(grib_accessor* a, char* v, size_t* len)
-{
-    grib_accessor_gaussian_grid_name* self = (grib_accessor_gaussian_grid_name*)a;
-
-    long N = 0, Ni = 0;
-    char tmp[MAX_GRIDNAME_LEN] = {0,};
-    size_t length = 0;
-    int ret       = GRIB_SUCCESS;
-
-    if ((ret = grib_get_long_internal(a->parent->h, self->N, &N)) != GRIB_SUCCESS)
-        return ret;
-    if ((ret = grib_get_long_internal(a->parent->h, self->Ni, &Ni)) != GRIB_SUCCESS)
-        return ret;
-
-    if (Ni == GRIB_MISSING_LONG) {
-        /* Reduced gaussian grid */
-        long isOctahedral = 0;
-        if ((ret = grib_get_long_internal(a->parent->h, self->isOctahedral, &isOctahedral)) != GRIB_SUCCESS)
-            return ret;
-        if (isOctahedral == 1) {
-            snprintf(tmp, sizeof(tmp), "O%ld", N);
-        }
-        else {
-            snprintf(tmp, sizeof(tmp), "N%ld", N); /* Classic */
-        }
-    }
-    else {
-        /* Regular gaussian grid */
-        snprintf(tmp, sizeof(tmp), "F%ld", N);
-    }
-    length = strlen(tmp) + 1;
-
-    if (*len < length) {
-        const char* cclass_name = a->cclass->name;
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
-                         cclass_name, a->name, length, *len);
-        *len = length;
-        return GRIB_BUFFER_TOO_SMALL;
-    }
-
-    strcpy(v, tmp);
-    *len = length;
-    return GRIB_SUCCESS;
-}
-
-static size_t string_length(grib_accessor* a)
-{
-    return MAX_GRIDNAME_LEN;
-}
diff --git a/src/accessor/todo/grib_accessor_class_gds_is_present.cc b/src/accessor/todo/grib_accessor_class_gds_is_present.cc
deleted file mode 100644
index 6066231ac..000000000
--- a/src/accessor/todo/grib_accessor_class_gds_is_present.cc
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/******************************
- *  Enrico Fucile
- *****************************/
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = pack_long
-   IMPLEMENTS = init
-   MEMBERS = const char* gds_present
-   MEMBERS = const char* grid_definition
-   MEMBERS = const char* bitmap_present
-   MEMBERS = const char* values
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_gds_is_present
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in gds_is_present */
-    const char* gds_present;
-    const char* grid_definition;
-    const char* bitmap_present;
-    const char* values;
-} grib_accessor_gds_is_present;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_gds_is_present = {
-    &grib_accessor_class_long,                      /* super */
-    "gds_is_present",                      /* name */
-    sizeof(grib_accessor_gds_is_present),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_gds_is_present = &_grib_accessor_class_gds_is_present;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    int n                              = 0;
-    grib_accessor_gds_is_present* self = (grib_accessor_gds_is_present*)a;
-    grib_handle* h                     = grib_handle_of_accessor(a);
-    self->gds_present                  = grib_arguments_get_name(h, c, n++);
-    self->grid_definition              = grib_arguments_get_name(h, c, n++);
-    self->bitmap_present               = grib_arguments_get_name(h, c, n++);
-    self->values                       = grib_arguments_get_name(h, c, n++);
-
-    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
-    a->flags |= GRIB_ACCESSOR_FLAG_HIDDEN;
-    a->length = 0;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_gds_is_present* self = (grib_accessor_gds_is_present*)a;
-    long missing    = 255;
-    int ret         = 0;
-    size_t size     = 0;
-    double* values  = NULL;
-    grib_context* c = a->context;
-    grib_handle* h  = grib_handle_of_accessor(a);
-
-    if (*val != 1)
-        return GRIB_NOT_IMPLEMENTED;
-
-    if ((ret = grib_get_size(h, self->values, &size)) != GRIB_SUCCESS)
-        return ret;
-
-    values = (double*)grib_context_malloc(c, size * sizeof(double));
-    if (!values)
-        return GRIB_OUT_OF_MEMORY;
-
-    if ((ret = grib_get_double_array_internal(h, self->values, values, &size)) != GRIB_SUCCESS) {
-        grib_context_free(c, values);
-        return ret;
-    }
-
-    if ((ret = grib_set_long_internal(h, self->gds_present, *val)) != GRIB_SUCCESS)
-        return ret;
-
-    if ((ret = grib_set_long_internal(h, self->bitmap_present, *val)) != GRIB_SUCCESS)
-        return ret;
-
-
-    if ((ret = grib_set_long_internal(h, self->grid_definition, missing)) != GRIB_SUCCESS)
-        return ret;
-
-    if ((ret = grib_set_double_array_internal(h, self->values, values, size)) != GRIB_SUCCESS)
-        return ret;
-
-    grib_context_free(c, values);
-
-    return GRIB_SUCCESS;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    int ret                            = 0;
-    grib_handle* h                     = grib_handle_of_accessor(a);
-    grib_accessor_gds_is_present* self = (grib_accessor_gds_is_present*)a;
-
-    if ((ret = grib_get_long_internal(h, self->gds_present, val)) != GRIB_SUCCESS)
-        return ret;
-
-    *len = 1;
-
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_gds_not_present_bitmap.cc b/src/accessor/todo/grib_accessor_class_gds_not_present_bitmap.cc
deleted file mode 100644
index d8ec8ecd1..000000000
--- a/src/accessor/todo/grib_accessor_class_gds_not_present_bitmap.cc
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/******************************
- *  Enrico Fucile
- *****************************/
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = init
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = pack_double
-   IMPLEMENTS = value_count
-   IMPLEMENTS = get_native_type
-   MEMBERS=const char*  missing_value
-   MEMBERS=const char*  number_of_values
-   MEMBERS=const char*  number_of_points
-   MEMBERS=const char*  latitude_of_first_point
-   MEMBERS=const char*  ni
-
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_gds_not_present_bitmap
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in gds_not_present_bitmap */
-    const char*  missing_value;
-    const char*  number_of_values;
-    const char*  number_of_points;
-    const char*  latitude_of_first_point;
-    const char*  ni;
-} grib_accessor_gds_not_present_bitmap;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_gds_not_present_bitmap = {
-    &grib_accessor_class_gen,                      /* super */
-    "gds_not_present_bitmap",                      /* name */
-    sizeof(grib_accessor_gds_not_present_bitmap),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_gds_not_present_bitmap = &_grib_accessor_class_gds_not_present_bitmap;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    int n                                      = 0;
-    grib_accessor_gds_not_present_bitmap* self = (grib_accessor_gds_not_present_bitmap*)a;
-    grib_handle* hand = grib_handle_of_accessor(a);
-
-    self->missing_value           = grib_arguments_get_name(hand, args, n++);
-    self->number_of_values        = grib_arguments_get_name(hand, args, n++);
-    self->number_of_points        = grib_arguments_get_name(hand, args, n++);
-    self->latitude_of_first_point = grib_arguments_get_name(hand, args, n++);
-    self->ni                      = grib_arguments_get_name(hand, args, n++);
-    a->length                     = 0;
-}
-
-static int value_count(grib_accessor* a, long* number_of_points)
-{
-    grib_accessor_gds_not_present_bitmap* self = (grib_accessor_gds_not_present_bitmap*)a;
-    *number_of_points = 0;
-    return grib_get_long_internal(grib_handle_of_accessor(a), self->number_of_points, number_of_points);
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_gds_not_present_bitmap* self = (grib_accessor_gds_not_present_bitmap*)a;
-    grib_handle* hand = grib_handle_of_accessor(a);
-
-    long number_of_points = 0, number_of_values = 0, ni = 0;
-    long latitude_of_first_point = 0;
-    size_t i                     = 0;
-    size_t n_vals                = 0;
-    long nn                      = 0;
-    long missing_value;
-
-    int err            = 0;
-    double* coded_vals = NULL;
-    err                = grib_value_count(a, &nn);
-    n_vals             = nn;
-    if (err)
-        return err;
-
-    if ((err = grib_get_long(hand, self->number_of_points, &number_of_points)) != GRIB_SUCCESS)
-        return err;
-
-    if ((err = grib_get_long(hand, self->number_of_values, &number_of_values)) != GRIB_SUCCESS)
-        return err;
-
-    if ((err = grib_get_long(hand, self->latitude_of_first_point, &latitude_of_first_point)) != GRIB_SUCCESS)
-        return err;
-
-    if ((err = grib_get_long(hand, self->missing_value, &missing_value)) != GRIB_SUCCESS)
-        return err;
-
-    if ((err = grib_get_long(hand, self->ni, &ni)) != GRIB_SUCCESS)
-        return err;
-
-    if (*len < number_of_points) {
-        *len = n_vals;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    if (number_of_values > 0) {
-        coded_vals = (double*)grib_context_malloc(a->context, number_of_values * sizeof(double));
-
-        if (coded_vals == NULL)
-            return GRIB_OUT_OF_MEMORY;
-    }
-
-    if (latitude_of_first_point == 0) {
-        for (i = 0; i < number_of_values; i++)
-            val[i] = 1;
-        for (i = number_of_values; i < number_of_points; i++)
-            val[i] = 0;
-    }
-    else {
-        for (i = 0; i < ni - 1; i++)
-            val[i] = 0;
-        for (i = ni - 1; i < number_of_points; i++)
-            val[i] = 1;
-    }
-
-    *len = number_of_points;
-
-    grib_context_free(a->context, coded_vals);
-    return err;
-}
-
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    // See deprecated/grib_accessor_class_gds_not_present_bitmap.cc for
-    // a possible implementation
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_DOUBLE;
-}
diff --git a/src/accessor/todo/grib_accessor_class_gen.cc b/src/accessor/todo/grib_accessor_class_gen.cc
deleted file mode 100644
index b611f5043..000000000
--- a/src/accessor/todo/grib_accessor_class_gen.cc
+++ /dev/null
@@ -1,675 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/***************************************************************************
- *   Jean Baptiste Filippi - 01.11.2005                                    *
- *   Enrico Fucile                                                         *
- *   Shahram Najm                                                          *
- ***************************************************************************/
-#include "grib_api_internal.h"
-#include "grib_value.h"
-#include <limits>
-#include <cassert>
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   IMPLEMENTS = unpack_long;pack_long; clear
-   IMPLEMENTS = unpack_double;pack_double;unpack_double_element;unpack_double_element_set
-   IMPLEMENTS = unpack_float
-   IMPLEMENTS = unpack_string;pack_string
-   IMPLEMENTS = unpack_string_array;pack_string_array
-   IMPLEMENTS = unpack_bytes;pack_bytes
-   IMPLEMENTS = unpack_double_subarray
-   IMPLEMENTS = init;dump;destroy;string_length
-   IMPLEMENTS = get_native_type;sub_section
-   IMPLEMENTS = next_offset;value_count;byte_offset;byte_count
-   IMPLEMENTS = notify_change;pack_expression
-   IMPLEMENTS  = update_size; next; preferred_size
-   IMPLEMENTS = compare;is_missing;make_clone
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static grib_section* sub_section(grib_accessor* a);
-static int get_native_type(grib_accessor*);
-static int is_missing(grib_accessor*);
-static int pack_bytes(grib_accessor*, const unsigned char*, size_t* len);
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int pack_string(grib_accessor*, const char*, size_t* len);
-static int pack_string_array(grib_accessor*, const char**, size_t* len);
-static int pack_expression(grib_accessor*, grib_expression*);
-static int unpack_bytes(grib_accessor*, unsigned char*, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_float(grib_accessor*, float* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static int unpack_string_array(grib_accessor*, char**, size_t* len);
-static size_t string_length(grib_accessor*);
-static long byte_count(grib_accessor*);
-static long byte_offset(grib_accessor*);
-static long next_offset(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-static void destroy(grib_context*, grib_accessor*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static int notify_change(grib_accessor*, grib_accessor*);
-static void update_size(grib_accessor*, size_t);
-static size_t preferred_size(grib_accessor*, int);
-static grib_accessor* next(grib_accessor*, int);
-static int compare(grib_accessor*, grib_accessor*);
-static int unpack_double_element(grib_accessor*, size_t i, double* val);
-static int unpack_double_element_set(grib_accessor*, const size_t* index_array, size_t len, double* val_array);
-static int unpack_double_subarray(grib_accessor*, double* val, size_t start, size_t len);
-static int clear(grib_accessor*);
-static grib_accessor* make_clone(grib_accessor*, grib_section*, int*);
-
-typedef struct grib_accessor_gen
-{
-    grib_accessor att;
-    /* Members defined in gen */
-} grib_accessor_gen;
-
-
-static grib_accessor_class _grib_accessor_class_gen = {
-    0,                      /* super */
-    "gen",                      /* name */
-    sizeof(grib_accessor_gen),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    &destroy,                    /* destroy */
-    &dump,                       /* dump */
-    &next_offset,                /* next_offset */
-    &string_length,              /* get length of string */
-    &value_count,                /* get number of values */
-    &byte_count,                 /* get number of bytes */
-    &byte_offset,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    &sub_section,                /* get sub_section */
-    0,               /* pack_missing */
-    &is_missing,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    &unpack_float,               /* unpack_float */
-    &pack_string,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    &pack_string_array,          /* pack_string_array */
-    &unpack_string_array,        /* unpack_string_array */
-    &pack_bytes,                 /* pack_bytes */
-    &unpack_bytes,               /* unpack_bytes */
-    &pack_expression,            /* pack_expression */
-    &notify_change,              /* notify_change */
-    &update_size,                /* update_size */
-    &preferred_size,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    &next,                       /* next accessor */
-    &compare,                    /* compare vs. another accessor */
-    &unpack_double_element,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    &unpack_double_element_set,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    &unpack_double_subarray,     /* unpack a subarray */
-    &clear,                      /* clear */
-    &make_clone,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_gen = &_grib_accessor_class_gen;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* param)
-{
-    grib_action* act = (grib_action*)(a->creator);
-    if (a->flags & GRIB_ACCESSOR_FLAG_TRANSIENT) {
-        a->length = 0;
-        if (!a->vvalue)
-            a->vvalue = (grib_virtual_value*)grib_context_malloc_clear(a->context, sizeof(grib_virtual_value));
-        a->vvalue->type   = grib_accessor_get_native_type(a);
-        a->vvalue->length = len;
-        if (act->default_value != NULL) {
-            const char* p = 0;
-            size_t s_len  = 1;
-            long l;
-            int ret = 0;
-            double d;
-            char tmp[1024];
-            grib_expression* expression = grib_arguments_get_expression(grib_handle_of_accessor(a), act->default_value, 0);
-            int type                    = grib_expression_native_type(grib_handle_of_accessor(a), expression);
-            switch (type) {
-                case GRIB_TYPE_DOUBLE:
-                    grib_expression_evaluate_double(grib_handle_of_accessor(a), expression, &d);
-                    grib_pack_double(a, &d, &s_len);
-                    break;
-
-                case GRIB_TYPE_LONG:
-                    grib_expression_evaluate_long(grib_handle_of_accessor(a), expression, &l);
-                    grib_pack_long(a, &l, &s_len);
-                    break;
-
-                default:
-                    s_len = sizeof(tmp);
-                    p     = grib_expression_evaluate_string(grib_handle_of_accessor(a), expression, tmp, &s_len, &ret);
-                    if (ret != GRIB_SUCCESS) {
-                        grib_context_log(a->context, GRIB_LOG_ERROR, "Unable to evaluate %s as string", a->name);
-                        Assert(0);
-                    }
-                    s_len = strlen(p) + 1;
-                    grib_pack_string(a, p, &s_len);
-                    break;
-            }
-        }
-    }
-    else {
-        a->length = len;
-    }
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    const int type = grib_accessor_get_native_type(a);
-    switch (type) {
-        case GRIB_TYPE_STRING:
-            grib_dump_string(dumper, a, NULL);
-            break;
-        case GRIB_TYPE_DOUBLE:
-            grib_dump_double(dumper, a, NULL);
-            break;
-        case GRIB_TYPE_LONG:
-            grib_dump_long(dumper, a, NULL);
-            break;
-        default:
-            grib_dump_bytes(dumper, a, NULL);
-    }
-}
-
-static long next_offset(grib_accessor* a)
-{
-    return a->offset + a->length;
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    *count = 1;
-    return 0;
-}
-
-static size_t string_length(grib_accessor* a)
-{
-    return 1024;
-}
-
-static long byte_count(grib_accessor* a)
-{
-    return a->length;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    grib_context_log(a->context, GRIB_LOG_ERROR,
-                     "Accessor %s [%s] must implement 'get_native_type'", a->name, a->cclass->name);
-    return GRIB_TYPE_UNDEFINED;
-}
-
-static long byte_offset(grib_accessor* a)
-{
-    return a->offset;
-}
-
-static int unpack_bytes(grib_accessor* a, unsigned char* val, size_t* len)
-{
-    unsigned char* buf = grib_handle_of_accessor(a)->buffer->data;
-    const long length = grib_byte_count(a);
-    const long offset = grib_byte_offset(a);
-
-    if (*len < length) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s, it is %ld bytes long", a->name, length);
-        *len = length;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    memcpy(val, buf + offset, length);
-    *len = length;
-
-    return GRIB_SUCCESS;
-}
-
-static int clear(grib_accessor* a)
-{
-    unsigned char* buf = grib_handle_of_accessor(a)->buffer->data;
-    const long length = grib_byte_count(a);
-    const long offset = grib_byte_offset(a);
-
-    memset(buf + offset, 0, length);
-
-    return GRIB_SUCCESS;
-}
-
-static int unpack_long(grib_accessor* a, long* v, size_t* len)
-{
-    int type = GRIB_TYPE_UNDEFINED;
-    if (a->cclass->unpack_double && a->cclass->unpack_double != &unpack_double) {
-        double val = 0.0;
-        size_t l   = 1;
-        grib_unpack_double(a, &val, &l);
-        if (val == GRIB_MISSING_DOUBLE)
-            *v = GRIB_MISSING_LONG;
-        else
-            *v = (long)val;
-        grib_context_log(a->context, GRIB_LOG_DEBUG, "Casting double %s to long", a->name);
-        return GRIB_SUCCESS;
-    }
-
-    if (a->cclass->unpack_string && a->cclass->unpack_string != &unpack_string) {
-        char val[1024];
-        size_t l   = sizeof(val);
-        char* last = NULL;
-        grib_unpack_string(a, val, &l);
-
-        *v = strtol(val, &last, 10);
-
-        if (*last == 0) {
-            grib_context_log(a->context, GRIB_LOG_DEBUG, "Casting string %s to long", a->name);
-            return GRIB_SUCCESS;
-        }
-    }
-
-    grib_context_log(a->context, GRIB_LOG_ERROR, "Cannot unpack key '%s' as long", a->name);
-    if (grib_get_native_type(grib_handle_of_accessor(a), a->name, &type) == GRIB_SUCCESS) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "Hint: Try unpacking as %s", grib_get_type_name(type));
-    }
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-template <typename T>
-static int unpack(grib_accessor* a, T* v, size_t* len)
-{
-    static_assert(std::is_floating_point<T>::value, "Requires floating point numbers");
-    int type = GRIB_TYPE_UNDEFINED;
-    const char* Tname = type_to_string<T>(*v);
-    if (a->cclass->unpack_long && a->cclass->unpack_long != &unpack_long) {
-        long val = 0;
-        size_t l = 1;
-        grib_unpack_long(a, &val, &l);
-        *v = val;
-        grib_context_log(a->context, GRIB_LOG_DEBUG, "Casting long %s to %s", a->name, Tname);
-        return GRIB_SUCCESS;
-    }
-
-    if (a->cclass->unpack_string && a->cclass->unpack_string != &unpack_string) {
-        char val[1024];
-        size_t l   = sizeof(val);
-        char* last = NULL;
-        grib_unpack_string(a, val, &l);
-
-        *v = strtod(val, &last);
-        if (*last == 0) { /* conversion of string to double worked */
-            grib_context_log(a->context, GRIB_LOG_DEBUG, "Casting string %s to %s", a->name, Tname);
-            return GRIB_SUCCESS;
-        }
-    }
-
-    grib_context_log(a->context, GRIB_LOG_ERROR, "Cannot unpack key '%s' as %s", a->name, Tname);
-    if (grib_get_native_type(grib_handle_of_accessor(a), a->name, &type) == GRIB_SUCCESS) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "Hint: Try unpacking as %s", grib_get_type_name(type));
-    }
-
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static int unpack_double(grib_accessor* a, double* v, size_t* len)
-{
-    return unpack<double>(a, v, len);
-}
-
-static int unpack_float(grib_accessor* a, float* v, size_t* len)
-{
-    return unpack<float>(a, v, len);
-}
-
-static int unpack_string(grib_accessor* a, char* v, size_t* len)
-{
-    int err = 0;
-    if (a->cclass->unpack_double && a->cclass->unpack_double != &unpack_double) {
-        double val = 0.0;
-        size_t l   = 1;
-        err = grib_unpack_double(a, &val, &l);
-        if (err) return err;
-        snprintf(v, 64, "%g", val);
-        *len = strlen(v);
-        grib_context_log(a->context, GRIB_LOG_DEBUG, "Casting double %s to string", a->name);
-        return GRIB_SUCCESS;
-    }
-
-    if (a->cclass->unpack_long && a->cclass->unpack_long != &unpack_long) {
-        long val = 0;
-        size_t l = 1;
-        err = grib_unpack_long(a, &val, &l);
-        if (err) return err;
-        snprintf(v, 64, "%ld", val);
-        *len = strlen(v);
-        grib_context_log(a->context, GRIB_LOG_DEBUG, "Casting long %s to string\n", a->name);
-        return GRIB_SUCCESS;
-    }
-
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static int unpack_string_array(grib_accessor* a, char** v, size_t* len)
-{
-    size_t length = 0;
-
-    int err = grib_get_string_length_acc(a, &length);
-    if (err)
-        return err;
-    v[0] = (char*)grib_context_malloc_clear(a->context, length);
-    grib_unpack_string(a, v[0], &length); // TODO(masn): check return value
-    *len = 1;
-
-    return GRIB_SUCCESS;
-}
-
-static int pack_expression(grib_accessor* a, grib_expression* e)
-{
-    size_t len        = 1;
-    long lval         = 0;
-    double dval       = 0;
-    const char* cval  = NULL;
-    int ret           = 0;
-    grib_handle* hand = grib_handle_of_accessor(a);
-
-    // Use the native type of the expression not the accessor
-    switch (grib_expression_native_type(hand, e)) {
-        case GRIB_TYPE_LONG: {
-            len = 1;
-            ret = grib_expression_evaluate_long(hand, e, &lval);
-            if (ret != GRIB_SUCCESS) {
-                grib_context_log(a->context, GRIB_LOG_ERROR, "Unable to set %s as long (from %s)",
-                                 a->name, e->cclass->name);
-                return ret;
-            }
-            /*if (hand->context->debug)
-                printf("ECCODES DEBUG grib_accessor_class_gen::pack_expression %s %ld\n", a->name,lval);*/
-            return grib_pack_long(a, &lval, &len);
-        }
-
-        case GRIB_TYPE_DOUBLE: {
-            len = 1;
-            ret = grib_expression_evaluate_double(hand, e, &dval);
-            if (ret != GRIB_SUCCESS) {
-                grib_context_log(a->context, GRIB_LOG_ERROR, "Unable to set %s as double (from %s)",
-                                 a->name, e->cclass->name);
-                return ret;
-            }
-            /*if (hand->context->debug)
-                printf("ECCODES DEBUG grib_accessor_class_gen::pack_expression %s %g\n", a->name, dval);*/
-            return grib_pack_double(a, &dval, &len);
-        }
-
-        case GRIB_TYPE_STRING: {
-            char tmp[1024];
-            len  = sizeof(tmp);
-            cval = grib_expression_evaluate_string(hand, e, tmp, &len, &ret);
-            if (ret != GRIB_SUCCESS) {
-                grib_context_log(a->context, GRIB_LOG_ERROR, "Unable to set %s as string (from %s)",
-                                 a->name, e->cclass->name);
-                return ret;
-            }
-            len = strlen(cval);
-            /*if (hand->context->debug)
-                printf("ECCODES DEBUG grib_accessor_class_gen::pack_expression %s %s\n", a->name, cval);*/
-            return grib_pack_string(a, cval, &len);
-        }
-    }
-
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static int pack_long(grib_accessor* a, const long* v, size_t* len)
-{
-    grib_context* c = a->context;
-    if (a->cclass->pack_double && a->cclass->pack_double != &pack_double) {
-        double* val = (double*)grib_context_malloc(c, *len * (sizeof(double)));
-        if (!val) {
-            grib_context_log(c, GRIB_LOG_ERROR, "Unable to allocate %zu bytes", *len * (sizeof(double)));
-            return GRIB_OUT_OF_MEMORY;
-        }
-        for (size_t i = 0; i < *len; i++)
-            val[i] = v[i];
-        int ret = grib_pack_double(a, val, len);
-        grib_context_free(c, val);
-        return ret;
-    }
-    grib_context_log(c, GRIB_LOG_ERROR, "Should not pack '%s' as an integer", a->name);
-    if (a->cclass->pack_string && a->cclass->pack_string != &pack_string) {
-        grib_context_log(c, GRIB_LOG_ERROR, "Try packing as a string");
-    }
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static int pack_double_array_as_long(grib_accessor* a, const double* v, size_t* len)
-{
-    grib_context* c = a->context;
-    int ret         = GRIB_SUCCESS;
-    size_t numBytes = *len * (sizeof(long));
-    long* lValues   = (long*)grib_context_malloc(c, numBytes);
-    if (!lValues) {
-        grib_context_log(c, GRIB_LOG_ERROR, "Unable to allocate %ld bytes", numBytes);
-        return GRIB_OUT_OF_MEMORY;
-    }
-    for (size_t i = 0; i < *len; i++)
-        lValues[i] = (long)v[i]; /* convert from double to long */
-    ret = grib_pack_long(a, lValues, len);
-    grib_context_free(c, lValues);
-    return ret;
-}
-
-static int pack_double(grib_accessor* a, const double* v, size_t* len)
-{
-    int do_pack_as_long = 0;
-    grib_context* c     = a->context;
-    if (a->cclass->pack_long && a->cclass->pack_long != &pack_long) {
-        do_pack_as_long = 1;
-    }
-    else {
-        /* ECC-648: Special case of codetable */
-        if (strcmp(a->cclass->name, "codetable") == 0) {
-            do_pack_as_long = 1;
-        }
-    }
-    if (do_pack_as_long) {
-        return pack_double_array_as_long(a, v, len);
-    }
-    grib_context_log(c, GRIB_LOG_ERROR, "Should not pack '%s' as a double", a->name);
-    if (a->cclass->pack_string && a->cclass->pack_string != &pack_string) {
-        grib_context_log(c, GRIB_LOG_ERROR, "Try packing as a string");
-    }
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static int pack_string_array(grib_accessor* a, const char** v, size_t* len)
-{
-    int err           = 0;
-    size_t length     = 0;
-    grib_accessor* as = 0;
-
-    as = a;
-    long i = (long)*len - 1;
-    while (as && i >= 0) {
-        length = strlen(v[i]);
-        err    = grib_pack_string(as, v[i], &length);
-        if (err)
-            return err;
-        --i;
-        as = as->same;
-    }
-    return GRIB_SUCCESS;
-}
-
-static int pack_string(grib_accessor* a, const char* v, size_t* len)
-{
-    if (a->cclass->pack_double && a->cclass->pack_double != &pack_double) {
-        size_t l   = 1;
-        char* endPtr = NULL; /* for error handling */
-        double val = strtod(v, &endPtr);
-        if (*endPtr) {
-            grib_context_log(a->context, GRIB_LOG_ERROR,
-                             "%s: Invalid value (%s) for key '%s'. String cannot be converted to a double",
-                             __func__, v, a->name);
-            return GRIB_WRONG_TYPE;
-        }
-        return grib_pack_double(a, &val, &l);
-    }
-
-    if (a->cclass->pack_long && a->cclass->pack_long != &pack_long) {
-        size_t l = 1;
-        long val = atol(v);
-        return grib_pack_long(a, &val, &l);
-    }
-
-    grib_context_log(a->context, GRIB_LOG_ERROR, "Should not pack '%s' as string", a->name);
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static int pack_bytes(grib_accessor* a, const unsigned char* val, size_t* len)
-{
-    const size_t length = *len;
-    if (length != a->length) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "pack_bytes: Wrong size (%zu) for %s. It is %ld bytes long",
-                         length, a->name, a->length);
-        return GRIB_BUFFER_TOO_SMALL;
-    }
-    grib_buffer_replace(a, val, length, 1, 1);
-    return GRIB_SUCCESS;
-}
-
-static void destroy(grib_context* ct, grib_accessor* a)
-{
-    grib_dependency_remove_observed(a);
-    grib_dependency_remove_observer(a);
-    if (a->vvalue != NULL) {
-        grib_context_free(ct, a->vvalue);
-        a->vvalue = NULL;
-    }
-    /*grib_context_log(ct,GRIB_LOG_DEBUG,"address=%p",a);*/
-}
-
-static grib_section* sub_section(grib_accessor* a)
-{
-    return NULL;
-}
-
-static int notify_change(grib_accessor* self, grib_accessor* observed)
-{
-    /* Default behaviour is to notify creator */
-    return grib_action_notify_change(self->creator, self, observed);
-}
-
-static void update_size(grib_accessor* a, size_t s)
-{
-    grib_context_log(a->context, GRIB_LOG_FATAL,
-                     "Accessor %s [%s] must implement 'update_size'", a->name, a->cclass->name);
-}
-
-static grib_accessor* next(grib_accessor* a, int mod)
-{
-    grib_accessor* next = NULL;
-    if (a->next) {
-        next = a->next;
-    }
-    else {
-        if (a->parent->owner)
-            next = a->parent->owner->cclass->next(a->parent->owner, 0);
-    }
-    return next;
-}
-
-static int compare(grib_accessor* a, grib_accessor* b)
-{
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-/* Redefined in all padding */
-
-static size_t preferred_size(grib_accessor* a, int from_handle)
-{
-    return a->length;
-}
-
-static int is_missing(grib_accessor* a)
-{
-    int i              = 0;
-    int is_missing     = 1;
-    unsigned char ones = 0xff;
-    unsigned char* v   = NULL;
-
-    if (a->flags & GRIB_ACCESSOR_FLAG_TRANSIENT) {
-        if (a->vvalue == NULL) {
-            grib_context_log(a->context, GRIB_LOG_ERROR, "%s internal error (flags=0x%lX)", a->name, a->flags);
-            Assert(!"grib_accessor_class_gen::is_missing(): a->vvalue == NULL");
-            return 0;
-        }
-        return a->vvalue->missing;
-    }
-    Assert(a->length >= 0);
-
-    v = grib_handle_of_accessor(a)->buffer->data + a->offset;
-
-    for (i = 0; i < a->length; i++) {
-        if (*v != ones) {
-            is_missing = 0;
-            break;
-        }
-        v++;
-    }
-
-    return is_missing;
-}
-
-static int unpack_double_element(grib_accessor* a, size_t i, double* val)
-{
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static int unpack_double_element_set(grib_accessor* a, const size_t* index_array, size_t len, double* val_array)
-{
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static int unpack_double_subarray(grib_accessor* a, double* val, size_t start, size_t len)
-{
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static grib_accessor* make_clone(grib_accessor* a, grib_section* s, int* err)
-{
-    *err = GRIB_NOT_IMPLEMENTED;
-    return NULL;
-}
diff --git a/src/accessor/todo/grib_accessor_class_getenv.cc b/src/accessor/todo/grib_accessor_class_getenv.cc
deleted file mode 100644
index 6bc0ced3e..000000000
--- a/src/accessor/todo/grib_accessor_class_getenv.cc
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_ascii
-   IMPLEMENTS = pack_string;unpack_string;value_count
-   IMPLEMENTS = init;string_length
-   MEMBERS= const char* name
-   MEMBERS= char* value
-   MEMBERS= const char* default_value
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_string(grib_accessor*, const char*, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static size_t string_length(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_getenv
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in ascii */
-    /* Members defined in getenv */
-    const char* name;
-    char* value;
-    const char* default_value;
-} grib_accessor_getenv;
-
-extern grib_accessor_class* grib_accessor_class_ascii;
-
-static grib_accessor_class _grib_accessor_class_getenv = {
-    &grib_accessor_class_ascii,                      /* super */
-    "getenv",                      /* name */
-    sizeof(grib_accessor_getenv),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    &string_length,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    &pack_string,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_getenv = &_grib_accessor_class_getenv;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* args)
-{
-    grib_accessor_getenv* self = (grib_accessor_getenv*)a;
-    static char undefined[]    = "undefined";
-
-    self->name          = grib_arguments_get_string(grib_handle_of_accessor(a), args, 0);
-    self->default_value = grib_arguments_get_string(grib_handle_of_accessor(a), args, 1);
-    if (!self->default_value)
-        self->default_value = undefined;
-    self->value = 0;
-}
-
-static int pack_string(grib_accessor* a, const char* val, size_t* len)
-{
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    grib_accessor_getenv* self = (grib_accessor_getenv*)a;
-    char* v                    = 0;
-    size_t l                   = 0;
-
-    if (!self->value) {
-        v = getenv(self->name);
-        if (!v)
-            v = (char*)self->default_value;
-        self->value = v;
-    }
-
-    l = strlen(self->value);
-    if (*len < l)
-        return GRIB_BUFFER_TOO_SMALL;
-    snprintf(val, 1024, "%s", self->value);
-    *len = strlen(self->value);
-
-    return GRIB_SUCCESS;
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    *count = 1;
-    return 0;
-}
-
-static size_t string_length(grib_accessor* a)
-{
-    return 1024;
-}
diff --git a/src/accessor/todo/grib_accessor_class_group.cc b/src/accessor/todo/grib_accessor_class_group.cc
deleted file mode 100644
index df2118bff..000000000
--- a/src/accessor/todo/grib_accessor_class_group.cc
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = unpack_string
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = init;dump;string_length
-   IMPLEMENTS = value_count
-   IMPLEMENTS = next_offset
-   IMPLEMENTS = get_native_type
-   IMPLEMENTS = compare
-   MEMBERS = char endCharacter
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static size_t string_length(grib_accessor*);
-static long next_offset(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static int compare(grib_accessor*, grib_accessor*);
-
-typedef struct grib_accessor_group
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in group */
-    char endCharacter;
-} grib_accessor_group;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_group = {
-    &grib_accessor_class_gen,                      /* super */
-    "group",                      /* name */
-    sizeof(grib_accessor_group),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    &next_offset,                /* next_offset */
-    &string_length,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    &compare,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_group = &_grib_accessor_class_group;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    grib_buffer* buffer       = grib_handle_of_accessor(a)->buffer;
-    grib_accessor_group* self = (grib_accessor_group*)a;
-
-    size_t i = 0;
-    unsigned char* v;
-    const char* s = grib_arguments_get_string(grib_handle_of_accessor(a), arg, 0);
-
-    if (s && strlen(s) > 1) {
-        grib_context_log(a->context, GRIB_LOG_WARNING,
-                         "Using only first character as group end of %s not the string %s", a->name, s);
-    }
-
-    self->endCharacter = s ? s[0] : 0;
-
-    v = buffer->data + a->offset;
-    i = 0;
-    if (s) {
-        while (*v != self->endCharacter && i <= buffer->ulength) {
-            if (*v > 126)
-                *v = 32;
-            v++;
-            i++;
-        }
-    }
-    else {
-        while (*v > 32 && *v != 61 && *v < 127 && i <= buffer->ulength) {
-            v++;
-            i++;
-        }
-    }
-    a->length = i;
-
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    *count = 1;
-    return 0;
-}
-
-static size_t string_length(grib_accessor* a)
-{
-    return a->length;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    grib_dump_string(dumper, a, NULL);
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_STRING;
-}
-
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    long i = 0;
-    size_t l = a->length + 1;
-    grib_handle* h = grib_handle_of_accessor(a);
-
-    if (*len < l) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
-                         a->cclass->name, a->name, l, *len);
-        *len = l;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    for (i = 0; i < a->length; i++)
-        val[i] = h->buffer->data[a->offset + i];
-    val[i] = 0;
-    *len = i;
-    return GRIB_SUCCESS;
-}
-
-static int unpack_long(grib_accessor* a, long* v, size_t* len)
-{
-    char val[1024] = {0,};
-    size_t l   = sizeof(val);
-    size_t i   = 0;
-    char* last = NULL;
-    int err    = grib_unpack_string(a, val, &l);
-
-    if (err)
-        return err;
-
-    i = 0;
-    while (i < l - 1 && val[i] == ' ')
-        i++;
-
-    if (val[i] == 0) {
-        *v = 0;
-        return 0;
-    }
-    if (val[i + 1] == ' ' && i < l - 2)
-        val[i + 1] = 0;
-
-    *v = strtol(val, &last, 10);
-
-    grib_context_log(a->context, GRIB_LOG_DEBUG, " Casting string %s to long", a->name);
-    return GRIB_SUCCESS;
-}
-
-static int unpack_double(grib_accessor* a, double* v, size_t* len)
-{
-    char val[1024];
-    size_t l   = sizeof(val);
-    char* last = NULL;
-    grib_unpack_string(a, val, &l);
-
-    *v = strtod(val, &last);
-
-    if (*last == 0) {
-        grib_context_log(a->context, GRIB_LOG_DEBUG, " Casting string %s to long", a->name);
-        return GRIB_SUCCESS;
-    }
-
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static int compare(grib_accessor* a, grib_accessor* b)
-{
-    grib_context_log(a->context, GRIB_LOG_ERROR, "%s:%s not implemented", __func__, a->name);
-    return GRIB_NOT_IMPLEMENTED;
-
-    // int retval = 0;
-    // char* aval = 0;
-    // char* bval = 0;
-    // int err    = 0;
-    // size_t alen = 0;
-    // size_t blen = 0;
-    // long count  = 0;
-    // err = grib_value_count(a, &count);
-    // if (err) return err;
-    // alen = count;
-    // err = grib_value_count(b, &count);
-    // if (err) return err;
-    // blen = count;
-    // if (alen != blen) return GRIB_COUNT_MISMATCH;
-    // aval = (char*)grib_context_malloc(a->context, alen * sizeof(char));
-    // bval = (char*)grib_context_malloc(b->context, blen * sizeof(char));
-    // grib_unpack_string(a, aval, &alen);
-    // grib_unpack_string(b, bval, &blen);
-    // retval = GRIB_SUCCESS;
-    // if (strcmp(aval, bval)) retval = GRIB_STRING_VALUE_MISMATCH;
-    // grib_context_free(a->context, aval);
-    // grib_context_free(b->context, bval);
-    // return retval;
-}
-
-static long next_offset(grib_accessor* a)
-{
-    return a->offset + a->length;
-}
diff --git a/src/accessor/todo/grib_accessor_class_gts_header.cc b/src/accessor/todo/grib_accessor_class_gts_header.cc
deleted file mode 100644
index 65b295634..000000000
--- a/src/accessor/todo/grib_accessor_class_gts_header.cc
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_ascii
-   IMPLEMENTS = unpack_string;value_count
-   IMPLEMENTS = init;string_length
-   MEMBERS =  int gts_offset
-   MEMBERS =  int gts_length
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static size_t string_length(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_gts_header
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in ascii */
-    /* Members defined in gts_header */
-    int gts_offset;
-    int gts_length;
-} grib_accessor_gts_header;
-
-extern grib_accessor_class* grib_accessor_class_ascii;
-
-static grib_accessor_class _grib_accessor_class_gts_header = {
-    &grib_accessor_class_ascii,                      /* super */
-    "gts_header",                      /* name */
-    sizeof(grib_accessor_gts_header),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    &string_length,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_gts_header = &_grib_accessor_class_gts_header;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_gts_header* self = (grib_accessor_gts_header*)a;
-    self->gts_offset = -1;
-    self->gts_length = -1;
-    self->gts_offset = grib_arguments_get_long(grib_handle_of_accessor(a), c, 0);
-    self->gts_length = grib_arguments_get_long(grib_handle_of_accessor(a), c, 1);
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-}
-
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    grib_accessor_gts_header* self = (grib_accessor_gts_header*)a;
-    grib_handle* h                 = grib_handle_of_accessor(a);
-    int offset                     = 0;
-    size_t length                  = 0;
-
-    if (h->gts_header == NULL || h->gts_header_len < 8) {
-        if (*len < 8)
-            return GRIB_BUFFER_TOO_SMALL;
-        snprintf(val, 1024, "missing");
-        return GRIB_SUCCESS;
-    }
-    if (*len < h->gts_header_len)
-        return GRIB_BUFFER_TOO_SMALL;
-
-    offset = self->gts_offset > 0 ? self->gts_offset : 0;
-    length = self->gts_length > 0 ? self->gts_length : h->gts_header_len;
-
-    memcpy(val, h->gts_header + offset, length);
-
-    *len = length;
-
-    return GRIB_SUCCESS;
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    *count = 1;
-    return 0;
-}
-
-static size_t string_length(grib_accessor* a)
-{
-    grib_handle* h = grib_handle_of_accessor(a);
-    return h->gts_header_len;
-}
diff --git a/src/accessor/todo/grib_accessor_class_hash_array.cc b/src/accessor/todo/grib_accessor_class_hash_array.cc
deleted file mode 100644
index d191a5232..000000000
--- a/src/accessor/todo/grib_accessor_class_hash_array.cc
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-
-/*******************************************************
- *   Enrico Fucile
- ******************************************************/
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = unpack_double;pack_double
-   IMPLEMENTS = unpack_string;pack_string;string_length
-   IMPLEMENTS = unpack_long;pack_long;destroy
-   IMPLEMENTS = init;dump;value_count;get_native_type
-   IMPLEMENTS = compare
-   MEMBERS = char* key
-   MEMBERS = grib_hash_array_value* ha
-    END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int pack_string(grib_accessor*, const char*, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static size_t string_length(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-static void destroy(grib_context*, grib_accessor*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static int compare(grib_accessor*, grib_accessor*);
-
-typedef struct grib_accessor_hash_array
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in hash_array */
-    char* key;
-    grib_hash_array_value* ha;
-} grib_accessor_hash_array;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_hash_array = {
-    &grib_accessor_class_gen,                      /* super */
-    "hash_array",                      /* name */
-    sizeof(grib_accessor_hash_array),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    &destroy,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    &string_length,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    &pack_string,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    &compare,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_hash_array = &_grib_accessor_class_hash_array;
-
-/* END_CLASS_IMP */
-
-#define MAX_HASH_ARRAY_STRING_LENGTH 255
-
-static void init(grib_accessor* a, const long len, grib_arguments* args)
-{
-    grib_accessor_hash_array* self = (grib_accessor_hash_array*)a;
-    a->length                      = 0;
-    self->key                      = 0;
-    self->ha                       = NULL;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    grib_dump_string(dumper, a, NULL);
-}
-
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_hash_array* self = (grib_accessor_hash_array*)a;
-    char s[200]                    = {0,};
-    snprintf(s, sizeof(s), "%g", *val);
-    self->key = grib_context_strdup(a->context, s);
-    self->ha  = 0;
-    return GRIB_SUCCESS;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_hash_array* self = (grib_accessor_hash_array*)a;
-    char s[200]                    = {0,};
-    snprintf(s, sizeof(s), "%ld", *val);
-    if (self->key)
-        grib_context_free(a->context, self->key);
-    self->key = grib_context_strdup(a->context, s);
-    self->ha  = 0;
-    return GRIB_SUCCESS;
-}
-
-static int pack_string(grib_accessor* a, const char* v, size_t* len)
-{
-    grib_accessor_hash_array* self = (grib_accessor_hash_array*)a;
-    self->key                      = grib_context_strdup(a->context, v);
-    self->ha                       = 0;
-    return GRIB_SUCCESS;
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static grib_hash_array_value* find_hash_value(grib_accessor* a, int* err)
-{
-    grib_accessor_hash_array* self = (grib_accessor_hash_array*)a;
-    grib_hash_array_value* ha_ret  = 0;
-    grib_hash_array_value* ha      = NULL;
-
-    ha = get_hash_array(grib_handle_of_accessor(a), a->creator);
-    if (!ha) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "unable to get hash value for %s", a->creator->name);
-        *err = GRIB_HASH_ARRAY_NO_MATCH;
-        return NULL;
-    }
-
-    *err = GRIB_SUCCESS;
-
-    Assert(ha != NULL);
-    if (!self->key) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "unable to get hash value for %s, set before getting", a->creator->name);
-        *err = GRIB_HASH_ARRAY_NO_MATCH;
-        return NULL;
-    }
-
-    ha_ret = (grib_hash_array_value*)grib_trie_get(ha->index, self->key);
-    if (!ha_ret)
-        ha_ret = (grib_hash_array_value*)grib_trie_get(ha->index, "default");
-
-    if (!ha_ret) {
-        *err = GRIB_HASH_ARRAY_NO_MATCH;
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "hash_array: no match for %s=%s",
-                         a->creator->name, self->key);
-        const char* full_path = get_hash_array_full_path(a->creator);
-        if (full_path) {
-            grib_context_log(a->context, GRIB_LOG_ERROR, "hash_array: file path = %s", full_path);
-        }
-        grib_context_log(a->context, GRIB_LOG_ERROR, "Hint: Check the key 'masterTablesVersionNumber'");
-        return NULL;
-    }
-    return ha_ret;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_hash_array_value* ha = 0;
-    grib_accessor_hash_array* self = (grib_accessor_hash_array*)a;
-    int err = 0;
-    size_t i = 0;
-
-    if (!self->ha) {
-        ha = find_hash_value(a, &err);
-        if (err)
-            return err;
-        self->ha = ha;
-    }
-
-    switch (self->ha->type) {
-        case GRIB_HASH_ARRAY_TYPE_INTEGER:
-            if (*len < self->ha->iarray->n) {
-                return GRIB_ARRAY_TOO_SMALL;
-            }
-            *len = self->ha->iarray->n;
-            for (i = 0; i < *len; i++)
-                val[i] = self->ha->iarray->v[i];
-            break;
-
-        default:
-            return GRIB_NOT_IMPLEMENTED;
-    }
-
-    return GRIB_SUCCESS;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    int type = GRIB_TYPE_STRING;
-    if (a->flags & GRIB_ACCESSOR_FLAG_LONG_TYPE)
-        type = GRIB_TYPE_LONG;
-
-    return type;
-}
-
-static void destroy(grib_context* c, grib_accessor* a)
-{
-    grib_accessor_hash_array* self = (grib_accessor_hash_array*)a;
-    if (self->key)
-        grib_context_free(c, self->key);
-}
-
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static size_t string_length(grib_accessor* a)
-{
-    return MAX_HASH_ARRAY_STRING_LENGTH;
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    int err                        = 0;
-    grib_accessor_hash_array* self = (grib_accessor_hash_array*)a;
-    grib_hash_array_value* ha      = 0;
-
-    if (!self->ha) {
-        ha = find_hash_value(a, &err);
-        if (err)
-            return err;
-        self->ha = ha;
-    }
-
-    *count = self->ha->iarray->n;
-    return err;
-}
-
-static int compare(grib_accessor* a, grib_accessor* b)
-{
-    return GRIB_NOT_IMPLEMENTED;
-}
diff --git a/src/accessor/todo/grib_accessor_class_headers_only.cc b/src/accessor/todo/grib_accessor_class_headers_only.cc
deleted file mode 100644
index d3a98efb0..000000000
--- a/src/accessor/todo/grib_accessor_class_headers_only.cc
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = unpack_long; get_native_type
-   IMPLEMENTS = init
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_headers_only
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in headers_only */
-} grib_accessor_headers_only;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_headers_only = {
-    &grib_accessor_class_gen,                      /* super */
-    "headers_only",                      /* name */
-    sizeof(grib_accessor_headers_only),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_headers_only = &_grib_accessor_class_headers_only;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->flags |= GRIB_ACCESSOR_FLAG_HIDDEN;
-    a->length = 0;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    *val = grib_handle_of_accessor(a)->partial;
-    *len = 1;
-    return 0;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_LONG;
-}
diff --git a/src/accessor/todo/grib_accessor_class_ibmfloat.cc b/src/accessor/todo/grib_accessor_class_ibmfloat.cc
deleted file mode 100644
index 27e6da1c5..000000000
--- a/src/accessor/todo/grib_accessor_class_ibmfloat.cc
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-#include <type_traits>
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_double
-   IMPLEMENTS = unpack_double;pack_double
-   IMPLEMENTS = unpack_float
-   IMPLEMENTS = init
-   IMPLEMENTS = next_offset
-   IMPLEMENTS = byte_count
-   IMPLEMENTS = value_count
-   IMPLEMENTS = byte_offset
-   MEMBERS    = grib_arguments* arg
-   IMPLEMENTS = update_size
-   IMPLEMENTS = nearest_smaller_value
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_float(grib_accessor*, float* val, size_t* len);
-static long byte_count(grib_accessor*);
-static long byte_offset(grib_accessor*);
-static long next_offset(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static void update_size(grib_accessor*, size_t);
-static int nearest_smaller_value (grib_accessor*, double, double*);
-
-typedef struct grib_accessor_ibmfloat
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in ibmfloat */
-    grib_arguments* arg;
-} grib_accessor_ibmfloat;
-
-extern grib_accessor_class* grib_accessor_class_double;
-
-static grib_accessor_class _grib_accessor_class_ibmfloat = {
-    &grib_accessor_class_double,                      /* super */
-    "ibmfloat",                      /* name */
-    sizeof(grib_accessor_ibmfloat),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    &next_offset,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    &byte_count,                 /* get number of bytes */
-    &byte_offset,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    &unpack_float,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    &update_size,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    &nearest_smaller_value,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_ibmfloat = &_grib_accessor_class_ibmfloat;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    grib_accessor_ibmfloat* self = (grib_accessor_ibmfloat*)a;
-    long count = 0;
-
-    self->arg = arg;
-    grib_value_count(a, &count);
-    a->length = 4 * count;
-    Assert(a->length >= 0);
-}
-
-template <typename T>
-static int unpack(grib_accessor* a, T* val, size_t* len)
-{
-    static_assert(std::is_floating_point<T>::value, "Requires floating point numbers");
-    unsigned long rlen = 0;
-    long count         = 0;
-    int err            = 0;
-    unsigned long i    = 0;
-    long bitp          = a->offset * 8;
-    grib_handle* hand  = grib_handle_of_accessor(a);
-
-    err = grib_value_count(a, &count);
-    if (err)
-        return err;
-    rlen = count;
-
-    if (*len < rlen) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size (%zu) for %s, it contains %lu values", *len, a->name, rlen);
-        *len = 0;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    for (i = 0; i < rlen; i++)
-        val[i] = (T)grib_long_to_ibm(grib_decode_unsigned_long(hand->buffer->data, &bitp, 32));
-
-    *len = rlen;
-    return GRIB_SUCCESS;
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    return unpack<double>(a, val, len);
-}
-
-static int unpack_float(grib_accessor* a, float* val, size_t* len)
-{
-    return unpack<float>(a, val, len);
-}
-
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_ibmfloat* self = (grib_accessor_ibmfloat*)a;
-    int ret                      = 0;
-    unsigned long i              = 0;
-    unsigned long rlen           = *len;
-    size_t buflen                = 0;
-    unsigned char* buf           = NULL;
-    long off                     = 0;
-
-    if (*len < 1) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s, it packs at least 1 value", a->name);
-        *len = 0;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    if (rlen == 1) {
-
-        //double x = 0;
-        //grib_nearest_smaller_ibm_float(val[0],&x);
-        //double y = grib_long_to_ibm(grib_ibm_to_long(val[0]));
-        //printf("IBMFLOAT val=%.20f nearest_smaller_ibm_float=%.20f long_to_ibm=%.20f\n",val[0],x ,y);
-
-        off = byte_offset(a) * 8;
-        ret = grib_encode_unsigned_long(grib_handle_of_accessor(a)->buffer->data, grib_ibm_to_long(val[0]), &off, 32);
-        if (*len > 1)
-            grib_context_log(a->context, GRIB_LOG_WARNING, "ibmfloat: Trying to pack %zu values in a scalar %s, packing first value",
-                             *len, a->name);
-        if (ret == GRIB_SUCCESS)
-            len[0] = 1;
-        return ret;
-    }
-
-    buflen = rlen * 4;
-
-    buf = (unsigned char*)grib_context_malloc(a->context, buflen);
-
-    for (i = 0; i < rlen; i++) {
-        grib_encode_unsigned_longb(buf, grib_ibm_to_long(val[i]), &off, 32);
-    }
-    ret = grib_set_long_internal(grib_handle_of_accessor(a), grib_arguments_get_name(a->parent->h, self->arg, 0), rlen);
-
-    if (ret == GRIB_SUCCESS)
-        grib_buffer_replace(a, buf, buflen, 1, 1);
-    else
-        *len = 0;
-
-    grib_context_free(a->context, buf);
-
-    a->length = byte_count(a);
-
-    return ret;
-}
-
-static long byte_count(grib_accessor* a)
-{
-    return a->length;
-}
-
-static int value_count(grib_accessor* a, long* len)
-{
-    grib_accessor_ibmfloat* self = (grib_accessor_ibmfloat*)a;
-    *len = 0;
-    if (!self->arg) {
-        *len = 1;
-        return 0;
-    }
-    return grib_get_long_internal(grib_handle_of_accessor(a), grib_arguments_get_name(a->parent->h, self->arg, 0), len);
-}
-
-static long byte_offset(grib_accessor* a)
-{
-    return a->offset;
-}
-
-static void update_size(grib_accessor* a, size_t s)
-{
-    a->length = (long)s;
-    Assert(a->length >= 0);
-}
-
-static long next_offset(grib_accessor* a)
-{
-    return grib_byte_offset(a) + grib_byte_count(a);
-}
-
-static int nearest_smaller_value(grib_accessor* a, double val, double* nearest)
-{
-    int ret = 0;
-    if (grib_nearest_smaller_ibm_float(val, nearest) == GRIB_INTERNAL_ERROR) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "ibm_float:nearest_smaller_value overflow value=%g", val);
-        grib_dump_content(grib_handle_of_accessor(a), stderr, "wmo", GRIB_DUMP_FLAG_HEXADECIMAL, 0);
-        ret = GRIB_INTERNAL_ERROR;
-    }
-    return ret;
-}
diff --git a/src/accessor/todo/grib_accessor_class_ieeefloat.cc b/src/accessor/todo/grib_accessor_class_ieeefloat.cc
deleted file mode 100644
index d6fa411bb..000000000
--- a/src/accessor/todo/grib_accessor_class_ieeefloat.cc
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-#include <type_traits>
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_double
-   IMPLEMENTS = unpack_double;pack_double
-   IMPLEMENTS = unpack_float
-   IMPLEMENTS = init
-   IMPLEMENTS = value_count
-   MEMBERS    = grib_arguments* arg
-   IMPLEMENTS = update_size
-   IMPLEMENTS = nearest_smaller_value
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_float(grib_accessor*, float* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static void update_size(grib_accessor*, size_t);
-static int nearest_smaller_value (grib_accessor*, double, double*);
-
-typedef struct grib_accessor_ieeefloat
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in ieeefloat */
-    grib_arguments* arg;
-} grib_accessor_ieeefloat;
-
-extern grib_accessor_class* grib_accessor_class_double;
-
-static grib_accessor_class _grib_accessor_class_ieeefloat = {
-    &grib_accessor_class_double,                      /* super */
-    "ieeefloat",                      /* name */
-    sizeof(grib_accessor_ieeefloat),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    &unpack_float,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    &update_size,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    &nearest_smaller_value,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_ieeefloat = &_grib_accessor_class_ieeefloat;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    grib_accessor_ieeefloat* self = (grib_accessor_ieeefloat*)a;
-    long count                    = 0;
-    self->arg                     = arg;
-    grib_value_count(a, &count);
-    a->length = 4 * count;
-    Assert(a->length >= 0);
-}
-
-static int value_count(grib_accessor* a, long* len)
-{
-    grib_accessor_ieeefloat* self = (grib_accessor_ieeefloat*)a;
-    *len = 0;
-
-    if (!self->arg) {
-        *len = 1;
-        return 0;
-    }
-    return grib_get_long_internal(grib_handle_of_accessor(a), grib_arguments_get_name(a->parent->h, self->arg, 0), len);
-}
-
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_ieeefloat* self = (grib_accessor_ieeefloat*)a;
-    int ret                       = 0;
-    unsigned long i               = 0;
-    unsigned long rlen            = (unsigned long)*len;
-    size_t buflen                 = 0;
-    unsigned char* buf            = NULL;
-    long off                      = 0;
-
-    if (*len < 1) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s, it packs at least 1 value", a->name);
-        *len = 0;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    if (rlen == 1) {
-        off = a->offset * 8;
-        ret = grib_encode_unsigned_long(grib_handle_of_accessor(a)->buffer->data, grib_ieee_to_long(val[0]), &off, 32);
-        if (*len > 1)
-            grib_context_log(a->context, GRIB_LOG_WARNING, "ieeefloat: Trying to pack %zu values in a scalar %s, packing first value",
-                            *len, a->name);
-        if (ret == GRIB_SUCCESS)
-            len[0] = 1;
-        return ret;
-    }
-
-    buflen = rlen * 4;
-
-    buf = (unsigned char*)grib_context_malloc(a->context, buflen);
-
-    for (i = 0; i < rlen; i++) {
-        grib_encode_unsigned_longb(buf, grib_ieee_to_long(val[i]), &off, 32);
-    }
-    ret = grib_set_long_internal(grib_handle_of_accessor(a), grib_arguments_get_name(a->parent->h, self->arg, 0), rlen);
-
-    if (ret == GRIB_SUCCESS)
-        grib_buffer_replace(a, buf, buflen, 1, 1);
-    else
-        *len = 0;
-
-    grib_context_free(a->context, buf);
-
-    return ret;
-}
-
-template <typename T>
-static int unpack(grib_accessor* a, T* val, size_t* len)
-{
-    static_assert(std::is_floating_point<T>::value, "Requires floating point numbers");
-    long rlen = 0;
-    int err   = 0;
-    long i    = 0;
-    long bitp = a->offset * 8;
-    grib_handle* hand  = grib_handle_of_accessor(a);
-
-    err = grib_value_count(a, &rlen);
-    if (err)
-        return err;
-
-    if (*len < (size_t)rlen) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size (%zu) for %s, it contains %ld values", *len, a->name, rlen);
-        *len = 0;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    for (i = 0; i < rlen; i++)
-        val[i] = (T)grib_long_to_ieee(grib_decode_unsigned_long(hand->buffer->data, &bitp, 32));
-
-    *len = rlen;
-    return GRIB_SUCCESS;
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    return unpack<double>(a, val, len);
-}
-
-static int unpack_float(grib_accessor* a, float* val, size_t* len)
-{
-    return unpack<float>(a, val, len);
-}
-
-static void update_size(grib_accessor* a, size_t s)
-{
-    a->length = (long)s;
-    Assert(a->length >= 0);
-}
-
-static int nearest_smaller_value(grib_accessor* a, double val, double* nearest)
-{
-    return grib_nearest_smaller_ieee_float(val, nearest);
-}
diff --git a/src/accessor/todo/grib_accessor_class_ifs_param.cc b/src/accessor/todo/grib_accessor_class_ifs_param.cc
deleted file mode 100644
index ba7e522c1..000000000
--- a/src/accessor/todo/grib_accessor_class_ifs_param.cc
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/**************************************
- *  Enrico Fucile
- **************************************/
-
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = unpack_long; pack_long
-   IMPLEMENTS = init; get_native_type
-   MEMBERS=const char*    paramId
-   MEMBERS=const char*    type
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_ifs_param
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in ifs_param */
-    const char*    paramId;
-    const char*    type;
-} grib_accessor_ifs_param;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_ifs_param = {
-    &grib_accessor_class_gen,                      /* super */
-    "ifs_param",                      /* name */
-    sizeof(grib_accessor_ifs_param),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_ifs_param = &_grib_accessor_class_ifs_param;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_ifs_param* self = (grib_accessor_ifs_param*)a;
-    int n                         = 0;
-
-    self->paramId = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->type    = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_ifs_param* self = (grib_accessor_ifs_param*)a;
-    int ret                       = 0;
-    long paramId                  = 0;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->paramId, &paramId)) != GRIB_SUCCESS)
-        return ret;
-
-    if (paramId > 129000 && paramId < 129999)
-        *val = paramId - 129000;
-    else if (paramId > 200000 && paramId < 200999)
-        *val = paramId - 200000;
-    else if (paramId > 211000 && paramId < 211999)
-        *val = paramId - 1000;
-    else
-        *val = paramId;
-
-    return ret;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_ifs_param* self = (grib_accessor_ifs_param*)a;
-    long type                     = 0;
-    long table                    = 128;
-    long paramId                  = *val;
-    long param;
-
-    grib_get_long(grib_handle_of_accessor(a), self->type, &type);
-
-    if (type == 33 || type == 35) {
-        if (paramId > 1000) {
-            table   = paramId / 1000;
-            param   = paramId - table * 1000;
-            paramId = param;
-        }
-        switch (table) {
-            case 210:
-                paramId += 211000;
-                break;
-            case 128:
-                paramId += 200000;
-                break;
-            default:
-                break;
-        }
-    }
-    if (type == 50 || type == 52) {
-        if (paramId > 1000) {
-            table   = paramId / 1000;
-            param   = paramId - table * 1000;
-            paramId = param;
-        }
-        switch (table) {
-            case 128:
-                paramId += 129000;
-                break;
-            default:
-                break;
-        }
-    }
-
-    return grib_set_long_internal(grib_handle_of_accessor(a), self->paramId, paramId);
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_LONG;
-}
diff --git a/src/accessor/todo/grib_accessor_class_julian_day.cc b/src/accessor/todo/grib_accessor_class_julian_day.cc
deleted file mode 100644
index 7a8e28cfc..000000000
--- a/src/accessor/todo/grib_accessor_class_julian_day.cc
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_double
-   IMPLEMENTS = unpack_long;pack_long
-   IMPLEMENTS = unpack_double;pack_double
-   IMPLEMENTS = dump
-   IMPLEMENTS = init
-   MEMBERS    = const char *date
-   MEMBERS    = const char *hour
-   MEMBERS    = const char *minute
-   MEMBERS    = const char *second
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_julian_day
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in julian_day */
-    const char *date;
-    const char *hour;
-    const char *minute;
-    const char *second;
-} grib_accessor_julian_day;
-
-extern grib_accessor_class* grib_accessor_class_double;
-
-static grib_accessor_class _grib_accessor_class_julian_day = {
-    &grib_accessor_class_double,                      /* super */
-    "julian_day",                      /* name */
-    sizeof(grib_accessor_julian_day),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_julian_day = &_grib_accessor_class_julian_day;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_julian_day* self = (grib_accessor_julian_day*)a;
-    int n                          = 0;
-
-    self->date   = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->hour   = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->minute = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->second = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-
-    a->length = 0;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    grib_dump_string(dumper, a, NULL);
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    const double v = *val;
-    return pack_double(a, &v, len);
-}
-
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_julian_day* self = (grib_accessor_julian_day*)a;
-    int ret                        = 0;
-    long hour                      = 0;
-    long minute                    = 0;
-    long second                    = 0;
-    long date                      = 0;
-    long year, month, day;
-
-    ret = grib_julian_to_datetime(*val, &year, &month, &day, &hour, &minute, &second);
-    if (ret != 0)
-        return ret;
-
-    date = year * 10000 + month * 100 + day;
-
-    ret = grib_set_long_internal(grib_handle_of_accessor(a), self->date, date);
-    if (ret != 0)
-        return ret;
-    ret = grib_set_long_internal(grib_handle_of_accessor(a), self->hour, hour);
-    if (ret != 0)
-        return ret;
-    ret = grib_set_long_internal(grib_handle_of_accessor(a), self->minute, minute);
-    if (ret != 0)
-        return ret;
-    ret = grib_set_long_internal(grib_handle_of_accessor(a), self->second, second);
-
-    return ret;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    int ret  = 0;
-    double v = 0;
-
-    ret  = unpack_double(a, &v, len);
-    *val = (long)v;
-
-    return ret;
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    int ret = 0;
-    long date, hour, minute, second;
-    long year, month, day;
-    grib_accessor_julian_day* self = (grib_accessor_julian_day*)a;
-
-    ret = grib_get_long_internal(grib_handle_of_accessor(a), self->date, &date);
-    if (ret != GRIB_SUCCESS)
-        return ret;
-    ret = grib_get_long_internal(grib_handle_of_accessor(a), self->hour, &hour);
-    if (ret != GRIB_SUCCESS)
-        return ret;
-    ret = grib_get_long_internal(grib_handle_of_accessor(a), self->minute, &minute);
-    if (ret != GRIB_SUCCESS)
-        return ret;
-    ret = grib_get_long_internal(grib_handle_of_accessor(a), self->second, &second);
-    if (ret != GRIB_SUCCESS)
-        return ret;
-
-    year = date / 10000;
-    date %= 10000;
-    month = date / 100;
-    date %= 100;
-    day = date;
-
-    ret = grib_datetime_to_julian(year, month, day, hour, minute, second, val);
-
-    return ret;
-}
diff --git a/src/accessor/todo/grib_accessor_class_ksec1expver.cc b/src/accessor/todo/grib_accessor_class_ksec1expver.cc
deleted file mode 100644
index 762bf66e2..000000000
--- a/src/accessor/todo/grib_accessor_class_ksec1expver.cc
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_ascii
-   IMPLEMENTS = unpack_long;pack_string;
-   IMPLEMENTS = pack_long
-   IMPLEMENTS = init
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int pack_string(grib_accessor*, const char*, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_ksec1expver
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in ascii */
-    /* Members defined in ksec1expver */
-} grib_accessor_ksec1expver;
-
-extern grib_accessor_class* grib_accessor_class_ascii;
-
-static grib_accessor_class _grib_accessor_class_ksec1expver = {
-    &grib_accessor_class_ascii,                      /* super */
-    "ksec1expver",                      /* name */
-    sizeof(grib_accessor_ksec1expver),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    &pack_string,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_ksec1expver = &_grib_accessor_class_ksec1expver;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    a->length = len;
-    Assert(a->length >= 0);
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    long value = 0;
-    long pos   = a->offset * 8;
-    char* intc = NULL;
-    char* pTemp = NULL;
-    char expver[5];
-    char refexpver[5];
-    size_t llen = a->length + 1;
-    Assert(a->length == 4);
-
-    if (*len < 1) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s it contains %d values ", a->name, 1);
-        *len = 0;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-    value = grib_decode_unsigned_long(grib_handle_of_accessor(a)->buffer->data, &pos, a->length * 8);
-
-    grib_unpack_string(a, refexpver, &llen);
-
-    /* test for endian */
-    intc = (char*)&value;
-    pTemp = intc;
-
-    expver[0] = *pTemp++;
-    expver[1] = *pTemp++;
-    expver[2] = *pTemp++;
-    expver[3] = *pTemp++;
-    expver[4] = 0;
-
-//     expver[0] = intc[0];
-//     expver[1] = intc[1];
-//     expver[2] = intc[2];
-//     expver[3] = intc[3];
-//     expver[4] = 0;
-
-    /* if there is a difference, have to reverse*/
-    if (strcmp(refexpver, expver)) {
-        intc[0] = expver[3];
-        intc[1] = expver[2];
-        intc[2] = expver[1];
-        intc[3] = expver[0];
-    }
-
-    *val = value;
-    *len = 1;
-    return GRIB_SUCCESS;
-}
-
-static int pack_string(grib_accessor* a, const char* val, size_t* len)
-{
-    int i = 0;
-    if (len[0] != 4) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong length for %s. It has to be 4", a->name);
-        return GRIB_INVALID_KEY_VALUE;
-    }
-    if (len[0] > (a->length) + 1) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "pack_string: Wrong size (%lu) for %s, it contains %ld values",
-                len[0], a->name, a->length + 1);
-        len[0] = 0;
-        return GRIB_BUFFER_TOO_SMALL;
-    }
-
-    for (i = 0; i < a->length; i++)
-        grib_handle_of_accessor(a)->buffer->data[a->offset + i] = val[i];
-
-    return GRIB_SUCCESS;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    char sval[5] = {0,};
-    size_t slen = 4;
-    snprintf(sval, sizeof(sval), "%04d", (int)(*val));
-    return pack_string(a, sval, &slen);
-}
diff --git a/src/accessor/todo/grib_accessor_class_label.cc b/src/accessor/todo/grib_accessor_class_label.cc
deleted file mode 100644
index 8d7831faf..000000000
--- a/src/accessor/todo/grib_accessor_class_label.cc
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = init;dump;get_native_type;unpack_string
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_label
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in label */
-} grib_accessor_label;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_label = {
-    &grib_accessor_class_gen,                      /* super */
-    "label",                      /* name */
-    sizeof(grib_accessor_label),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_label = &_grib_accessor_class_label;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->flags |= GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC;
-    a->length = 0;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    grib_dump_label(dumper, a, NULL);
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_LABEL;
-}
-
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    size_t vlen = strlen(a->name);
-    if (vlen > *len)
-        return GRIB_BUFFER_TOO_SMALL;
-    *len = vlen;
-    strcpy(val, a->name);
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_latlonvalues.cc b/src/accessor/todo/grib_accessor_class_latlonvalues.cc
deleted file mode 100644
index e559eaa3d..000000000
--- a/src/accessor/todo/grib_accessor_class_latlonvalues.cc
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_double
-   IMPLEMENTS = unpack_double;
-   IMPLEMENTS = value_count
-   IMPLEMENTS = init
-   MEMBERS =const char* values
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_latlonvalues
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in latlonvalues */
-    const char* values;
-} grib_accessor_latlonvalues;
-
-extern grib_accessor_class* grib_accessor_class_double;
-
-static grib_accessor_class _grib_accessor_class_latlonvalues = {
-    &grib_accessor_class_double,                      /* super */
-    "latlonvalues",                      /* name */
-    sizeof(grib_accessor_latlonvalues),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_latlonvalues = &_grib_accessor_class_latlonvalues;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_latlonvalues* self = (grib_accessor_latlonvalues*)a;
-    int n                            = 0;
-
-    self->values = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_context* c = a->context;
-    int err         = 0;
-    double* v       = val;
-    double lat, lon, value;
-    size_t size         = 0;
-    long count          = 0;
-    grib_iterator* iter = grib_iterator_new(grib_handle_of_accessor(a), 0, &err);
-    if (err) {
-        if (iter) grib_iterator_delete(iter);
-        grib_context_log(c, GRIB_LOG_ERROR, "latlonvalues: Unable to create iterator");
-        return err;
-    }
-
-    err  = value_count(a, &count);
-    if (err) return err;
-    size = count;
-
-    if (*len < size) {
-        if (iter) grib_iterator_delete(iter);
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    while (grib_iterator_next(iter, &lat, &lon, &value)) {
-        *(v++) = lat;
-        *(v++) = lon;
-        *(v++) = value;
-    }
-
-    grib_iterator_delete(iter);
-
-    *len = size;
-
-    return GRIB_SUCCESS;
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    grib_accessor_latlonvalues* self = (grib_accessor_latlonvalues*)a;
-    grib_handle* h                   = grib_handle_of_accessor(a);
-    int ret = GRIB_SUCCESS;
-    size_t size;
-    if ((ret = grib_get_size(h, self->values, &size)) != GRIB_SUCCESS) {
-        grib_context_log(h->context, GRIB_LOG_ERROR, "latlonvalues: Unable to get size of %s", self->values);
-        return ret;
-    }
-
-    *count = 3 * size;
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_library_version.cc b/src/accessor/todo/grib_accessor_class_library_version.cc
deleted file mode 100644
index 2088b68c4..000000000
--- a/src/accessor/todo/grib_accessor_class_library_version.cc
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_ascii
-   IMPLEMENTS = unpack_string;value_count;string_length
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static size_t string_length(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-
-typedef struct grib_accessor_library_version
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in ascii */
-    /* Members defined in library_version */
-} grib_accessor_library_version;
-
-extern grib_accessor_class* grib_accessor_class_ascii;
-
-static grib_accessor_class _grib_accessor_class_library_version = {
-    &grib_accessor_class_ascii,                      /* super */
-    "library_version",                      /* name */
-    sizeof(grib_accessor_library_version),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    0,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    &string_length,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_library_version = &_grib_accessor_class_library_version;
-
-/* END_CLASS_IMP */
-
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    char result[30] = {0,};
-    size_t size;
-
-    int major    = ECCODES_MAJOR_VERSION;
-    int minor    = ECCODES_MINOR_VERSION;
-    int revision = ECCODES_REVISION_VERSION;
-
-    snprintf(result,  sizeof(result), "%d.%d.%d", major, minor, revision);
-    size = sizeof(result);
-
-    if (*len < size)
-        return GRIB_ARRAY_TOO_SMALL;
-    strcpy(val, result);
-
-    *len = size;
-
-    return GRIB_SUCCESS;
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    *count = 1;
-    return 0;
-}
-
-static size_t string_length(grib_accessor* a)
-{
-    return 255;
-}
diff --git a/src/accessor/todo/grib_accessor_class_long_vector.cc b/src/accessor/todo/grib_accessor_class_long_vector.cc
deleted file mode 100644
index 612163a3e..000000000
--- a/src/accessor/todo/grib_accessor_class_long_vector.cc
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/**************************************
- *  Enrico Fucile
- **************************************/
-
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_abstract_long_vector
-   IMPLEMENTS = init
-   IMPLEMENTS = unpack_long;pack_long
-   IMPLEMENTS = unpack_double;get_native_type
-   MEMBERS = const char* vector
-   MEMBERS = int index
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_long_vector
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in abstract_long_vector */
-    long* v;
-    long pack_index;
-    int number_of_elements;
-    /* Members defined in long_vector */
-    const char* vector;
-    int index;
-} grib_accessor_long_vector;
-
-extern grib_accessor_class* grib_accessor_class_abstract_long_vector;
-
-static grib_accessor_class _grib_accessor_class_long_vector = {
-    &grib_accessor_class_abstract_long_vector,                      /* super */
-    "long_vector",                      /* name */
-    sizeof(grib_accessor_long_vector),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_long_vector = &_grib_accessor_class_long_vector;
-
-/* END_CLASS_IMP */
-
-typedef struct grib_accessor_abstract_long_vector
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in abstract_long_vector */
-    long* v;
-    long pack_index;
-    int number_of_elements;
-} grib_accessor_abstract_long_vector;
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_long_vector* self       = (grib_accessor_long_vector*)a;
-    grib_accessor* va                     = NULL;
-    grib_accessor_abstract_long_vector* v = NULL;
-    int n                                 = 0;
-
-    self->vector = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    va = (grib_accessor*)grib_find_accessor(grib_handle_of_accessor(a), self->vector);
-    v  = (grib_accessor_abstract_long_vector*)va;
-
-    self->index = grib_arguments_get_long(grib_handle_of_accessor(a), c, n++);
-
-    /* check self->index on init and never change it */
-    Assert(self->index < v->number_of_elements && self->index >= 0);
-
-    a->length = 0;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    size_t size = 0;
-    int err = 0;
-    long* vector;
-    grib_accessor_long_vector* self       = (grib_accessor_long_vector*)a;
-    grib_accessor* va                     = NULL;
-    grib_accessor_abstract_long_vector* v = NULL;
-
-    va = (grib_accessor*)grib_find_accessor(grib_handle_of_accessor(a), self->vector);
-    v  = (grib_accessor_abstract_long_vector*)va;
-
-    /*TODO implement the dirty mechanism to avoid to unpack every time */
-    err = grib_get_size(grib_handle_of_accessor(a), self->vector, &size);
-    if (err) return err;
-    DEBUG_ASSERT(size > 0);
-    vector = (long*)grib_context_malloc(a->context, sizeof(long) * size);
-    err = grib_unpack_long(va, vector, &size);
-    grib_context_free(a->context, vector);
-    if (err) return err;
-
-    *val = v->v[self->index];
-
-    return GRIB_SUCCESS;
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    long lval                             = 0;
-    int err                               = 0;
-    grib_accessor_long_vector* self       = (grib_accessor_long_vector*)a;
-    grib_accessor* va                     = NULL;
-    grib_accessor_abstract_long_vector* v = NULL;
-    va                                    = (grib_accessor*)grib_find_accessor(grib_handle_of_accessor(a), self->vector);
-    v                                     = (grib_accessor_abstract_long_vector*)va;
-
-    err = unpack_long(a, &lval, len);
-
-    *val = (double)v->v[self->index];
-
-    return err;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    int err                               = 0;
-    grib_accessor_long_vector* self       = (grib_accessor_long_vector*)a;
-    grib_accessor* va                     = NULL;
-    grib_accessor_abstract_long_vector* v = NULL;
-
-    va = (grib_accessor*)grib_find_accessor(grib_handle_of_accessor(a), self->vector);
-    v  = (grib_accessor_abstract_long_vector*)va;
-
-    v->pack_index = self->index;
-
-    err = grib_pack_long(va, val, len);
-
-    return err;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_LONG;
-}
diff --git a/src/accessor/todo/grib_accessor_class_lookup.cc b/src/accessor/todo/grib_accessor_class_lookup.cc
deleted file mode 100644
index 5fc2880a8..000000000
--- a/src/accessor/todo/grib_accessor_class_lookup.cc
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-#include <cctype>
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long; unpack_string
-   IMPLEMENTS = init;post_init;dump
-   IMPLEMENTS = byte_offset;byte_count
-   IMPLEMENTS = pack_long
-   IMPLEMENTS = notify_change
-   MEMBERS    = long llength
-   MEMBERS    = long loffset
-   MEMBERS    = grib_expression* real_name
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static long byte_count(grib_accessor*);
-static long byte_offset(grib_accessor*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static void post_init(grib_accessor*);
-static int notify_change(grib_accessor*, grib_accessor*);
-
-typedef struct grib_accessor_lookup
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in lookup */
-    long llength;
-    long loffset;
-    grib_expression* real_name;
-} grib_accessor_lookup;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_lookup = {
-    &grib_accessor_class_long,                      /* super */
-    "lookup",                      /* name */
-    sizeof(grib_accessor_lookup),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    &post_init,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    &byte_count,                 /* get number of bytes */
-    &byte_offset,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    &notify_change,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_lookup = &_grib_accessor_class_lookup;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    grib_accessor_lookup* self = (grib_accessor_lookup*)a;
-    a->length                  = 0;
-    self->llength              = len;
-    self->loffset              = grib_arguments_get_long(grib_handle_of_accessor(a), arg, 0);
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    self->real_name = grib_arguments_get_expression(grib_handle_of_accessor(a), arg, 1);
-}
-
-static void post_init(grib_accessor* a)
-{
-    grib_accessor_lookup* self = (grib_accessor_lookup*)a;
-    if (self->real_name) {
-        grib_dependency_observe_expression(a, self->real_name);
-    }
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    grib_accessor_lookup* self = (grib_accessor_lookup*)a;
-    unsigned char bytes[1024]  = {0,};
-    char msg[1024] = {0,};
-    char buf[2048];
-    int i;
-    unsigned long v = 0;
-
-    size_t llen = self->llength;
-    grib_unpack_bytes(a, bytes, &llen); /* TODO: Unpack byte unpack the wrong offset */
-
-    bytes[llen] = 0;
-    for (i = 0; i < llen; i++) {
-        msg[i] = isprint(bytes[i]) ? bytes[i] : '?';
-        v <<= 8;
-        v |= bytes[i];
-    }
-
-    msg[llen] = 0;
-
-    snprintf(buf, sizeof(buf), "%s %lu %ld-%ld", msg, v, (long)a->offset + self->loffset, (long)self->llength);
-
-    grib_dump_long(dumper, a, buf);
-}
-
-static int unpack_string(grib_accessor* a, char* v, size_t* len)
-{
-    grib_accessor_lookup* self = (grib_accessor_lookup*)a;
-    unsigned char bytes[1024]  = {0,};
-    int i;
-
-    size_t llen = self->llength;
-    grib_unpack_bytes(a, bytes, &llen); /* TODO: Unpack byte unpack the wrong offset */
-
-    bytes[llen] = 0;
-
-    for (i = 0; i < llen; i++) {
-        v[i] = isprint(bytes[i]) ? bytes[i] : '?';
-    }
-
-    v[llen] = 0;
-    if (llen == 1 && v[0] == '?') {
-        /* Try unpack as long */
-        size_t length = 10;
-        long lval     = 0;
-        int err       = unpack_long(a, &lval, &length);
-        if (!err) {
-            char str[5];
-            int conv = snprintf(str, sizeof(str), "%ld", lval);
-            if (conv == 1) {
-                v[0] = str[0];
-            }
-        }
-    }
-
-    return GRIB_SUCCESS;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_lookup* self = (grib_accessor_lookup*)a;
-    grib_handle* h           = grib_handle_of_accessor(a);
-
-    long pos = (a->offset + self->loffset) * 8;
-
-    if (len[0] < 1) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s it contains %d values ", a->name, 1);
-        len[0] = 0;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    /* This is used when reparsing or rebuilding */
-    if (h->loader) {
-        Assert(*len == 1);
-        return h->loader->lookup_long(h->context, h->loader, a->name, val);
-    }
-
-    val[0] = grib_decode_unsigned_long(h->buffer->data, &pos, self->llength * 8);
-    len[0] = 1;
-
-    /*printf("###########lookup unpack_long: %s %ld %ld\n",a->name, pos/8, val[0]);*/
-
-    return GRIB_SUCCESS;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static long byte_count(grib_accessor* a)
-{
-    grib_accessor_lookup* self = (grib_accessor_lookup*)a;
-    return self->llength;
-}
-
-static long byte_offset(grib_accessor* a)
-{
-    grib_accessor_lookup* self = (grib_accessor_lookup*)a;
-    return self->loffset;
-}
-
-static int notify_change(grib_accessor* self, grib_accessor* changed)
-{
-    /* Forward changes */
-    return grib_dependency_notify_change(self);
-}
diff --git a/src/accessor/todo/grib_accessor_class_mars_param.cc b/src/accessor/todo/grib_accessor_class_mars_param.cc
deleted file mode 100644
index beb7a68c5..000000000
--- a/src/accessor/todo/grib_accessor_class_mars_param.cc
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_ascii
-   IMPLEMENTS = unpack_string
-   IMPLEMENTS = init; string_length
-   MEMBERS=  const char* paramId
-   MEMBERS=  const char* table
-   MEMBERS=  const char* param
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static size_t string_length(grib_accessor*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_mars_param
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in ascii */
-    /* Members defined in mars_param */
-    const char* paramId;
-    const char* table;
-    const char* param;
-} grib_accessor_mars_param;
-
-extern grib_accessor_class* grib_accessor_class_ascii;
-
-static grib_accessor_class _grib_accessor_class_mars_param = {
-    &grib_accessor_class_ascii,                      /* super */
-    "mars_param",                      /* name */
-    sizeof(grib_accessor_mars_param),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    &string_length,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_mars_param = &_grib_accessor_class_mars_param;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    int n                          = 0;
-    grib_accessor_mars_param* self = (grib_accessor_mars_param*)a;
-    self->paramId                  = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->table                    = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->param                    = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-}
-
-// For an implementation of pack_string, see
-//   src/deprecated/grib_accessor_class_mars_param.cc
-
-// For an alternative implementation of unpack_string, see
-//   src/deprecated/grib_accessor_class_mars_param.cc
-//
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    grib_accessor_mars_param* self = (grib_accessor_mars_param*)a;
-    long param                     = 0;
-    long table                     = 0;
-    int ret                        = 0;
-
-    if (self->table != NULL && (ret = grib_get_long_internal(grib_handle_of_accessor(a), self->table, &table)) != GRIB_SUCCESS)
-        return ret;
-    if (self->param != NULL && (ret = grib_get_long_internal(grib_handle_of_accessor(a), self->param, &param)) != GRIB_SUCCESS)
-        return ret;
-
-    /*if (table==200) table=128;*/
-    snprintf(val, 32, "%ld.%ld", param, table);
-    *len = strlen(val) + 1;
-
-    return GRIB_SUCCESS;
-}
-
-static size_t string_length(grib_accessor* a)
-{
-    return 7;
-}
diff --git a/src/accessor/todo/grib_accessor_class_mars_step.cc b/src/accessor/todo/grib_accessor_class_mars_step.cc
deleted file mode 100644
index 7792995a7..000000000
--- a/src/accessor/todo/grib_accessor_class_mars_step.cc
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_ascii
-   IMPLEMENTS = pack_string;unpack_string;value_count;string_length
-   IMPLEMENTS = pack_long; unpack_long
-   IMPLEMENTS = get_native_type
-   IMPLEMENTS = init
-   MEMBERS    = const char* stepRange
-   MEMBERS    = const char* stepType
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int pack_string(grib_accessor*, const char*, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static size_t string_length(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_mars_step
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in ascii */
-    /* Members defined in mars_step */
-    const char* stepRange;
-    const char* stepType;
-} grib_accessor_mars_step;
-
-extern grib_accessor_class* grib_accessor_class_ascii;
-
-static grib_accessor_class _grib_accessor_class_mars_step = {
-    &grib_accessor_class_ascii,                      /* super */
-    "mars_step",                      /* name */
-    sizeof(grib_accessor_mars_step),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    &string_length,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    &pack_string,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_mars_step = &_grib_accessor_class_mars_step;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    int n                         = 0;
-    grib_accessor_mars_step* self = (grib_accessor_mars_step*)a;
-    self->stepRange               = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->stepType                = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-}
-
-static int pack_string(grib_accessor* a, const char* val, size_t* len)
-{
-    char stepType[100];
-    size_t stepTypeLen = 100;
-    char buf[100]      = {0,};
-    int ret;
-    grib_accessor_mars_step* self = (grib_accessor_mars_step*)a;
-    grib_accessor* stepRangeAcc   = grib_find_accessor(grib_handle_of_accessor(a), self->stepRange);
-
-    if (!stepRangeAcc) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "%s not found", self->stepRange);
-        return GRIB_NOT_FOUND;
-    }
-
-    if ((ret = grib_get_string(grib_handle_of_accessor(a), self->stepType, stepType, &stepTypeLen)) != GRIB_SUCCESS)
-        return ret;
-
-    if (!strcmp(stepType, "instant"))
-        snprintf(buf, sizeof(buf), "%s", val);
-    else
-        snprintf(buf, sizeof(buf), "0-%s", val);
-
-    return grib_pack_string(stepRangeAcc, buf, len);
-}
-
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    int ret                       = 0;
-    grib_accessor_mars_step* self = (grib_accessor_mars_step*)a;
-    char buf[100]                 = {0,};
-    char* p       = NULL;
-    size_t buflen = 100;
-    long step;
-    grib_accessor* stepRangeAcc = grib_find_accessor(grib_handle_of_accessor(a), self->stepRange);
-    const char* cclass_name = a->cclass->name;
-
-    if (!stepRangeAcc) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "%s: %s not found", cclass_name, self->stepRange);
-        return GRIB_NOT_FOUND;
-    }
-
-    if ((ret = grib_unpack_string(stepRangeAcc, buf, &buflen)) != GRIB_SUCCESS)
-        return ret;
-
-    if (*len < buflen) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
-                         cclass_name, a->name, buflen, *len);
-        *len = buflen;
-        return GRIB_BUFFER_TOO_SMALL;
-    }
-
-    strcpy(val, buf);
-    step = strtol(buf, &p, 10);
-
-    if (p != NULL && *p == '-' && step == 0)
-        strcpy(val, ++p);
-
-    *len = strlen(val);
-
-    return ret;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    char buff[100] = {0,};
-    size_t bufflen = 100;
-
-    snprintf(buff, sizeof(buff), "%ld", *val);
-
-    return pack_string(a, buff, &bufflen);
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_mars_step* self = (grib_accessor_mars_step*)a;
-    grib_accessor* stepRangeAcc   = grib_find_accessor(grib_handle_of_accessor(a), self->stepRange);
-
-    if (!stepRangeAcc)
-        return GRIB_NOT_FOUND;
-
-    return grib_unpack_long(stepRangeAcc, val, len);
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    *count = 1;
-    return 0;
-}
-
-static size_t string_length(grib_accessor* a)
-{
-    return 16;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_LONG;
-}
diff --git a/src/accessor/todo/grib_accessor_class_message.cc b/src/accessor/todo/grib_accessor_class_message.cc
deleted file mode 100644
index 6c5587b22..000000000
--- a/src/accessor/todo/grib_accessor_class_message.cc
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_bytes
-   IMPLEMENTS = init;update_size;resize; value_count
-   IMPLEMENTS = unpack_string; string_length
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static size_t string_length(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static void update_size(grib_accessor*, size_t);
-static void resize(grib_accessor*,size_t);
-
-typedef struct grib_accessor_message
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in bytes */
-    /* Members defined in message */
-} grib_accessor_message;
-
-extern grib_accessor_class* grib_accessor_class_bytes;
-
-static grib_accessor_class _grib_accessor_class_message = {
-    &grib_accessor_class_bytes,                      /* super */
-    "message",                      /* name */
-    sizeof(grib_accessor_message),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    &string_length,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    &update_size,                /* update_size */
-    0,             /* preferred_size */
-    &resize,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_message = &_grib_accessor_class_message;
-
-/* END_CLASS_IMP */
-
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    a->flags |= GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC;
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->length = grib_handle_of_accessor(a)->buffer->ulength - len - a->offset;
-}
-
-// static int compare(grib_accessor* a, grib_accessor* b)
-// {
-//     if (a->length != b->length)
-//         return GRIB_COUNT_MISMATCH;
-//     return GRIB_SUCCESS;
-// }
-
-static void update_size(grib_accessor* a, size_t new_size)
-{
-    a->length = new_size;
-}
-
-static void resize(grib_accessor* a, size_t new_size)
-{
-    grib_context_log(a->context, GRIB_LOG_FATAL, "%s %s: Not supported", a->cclass->name, __func__);
-
-    // void* zero = grib_context_malloc_clear(a->context, new_size);
-    // grib_buffer_replace(a, (const unsigned char*)zero, new_size, 1, 0);
-    // grib_context_free(a->context, zero);
-    // grib_context_log(a->context, GRIB_LOG_DEBUG, "resize: grib_accessor_class_message %ld %ld %s %s",
-    //                 (long)new_size, (long)a->length, a->cclass->name, a->name);
-    // Assert(new_size == a->length);
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    *count = 1;
-    return 0;
-}
-
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    long i = 0;
-    size_t l = string_length(a) + 1;
-    grib_handle* h = grib_handle_of_accessor(a);
-
-    if (*len < l) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
-                         a->cclass->name, a->name, l, *len);
-        *len = l;
-        return GRIB_BUFFER_TOO_SMALL;
-    }
-
-    for (i = 0; i < a->length; i++)
-        val[i] = h->buffer->data[a->offset + i];
-    val[i] = 0;
-    *len = i;
-    return GRIB_SUCCESS;
-}
-
-static size_t string_length(grib_accessor* a)
-{
-    return a->length;
-}
diff --git a/src/accessor/todo/grib_accessor_class_message_copy.cc b/src/accessor/todo/grib_accessor_class_message_copy.cc
deleted file mode 100644
index 30806b163..000000000
--- a/src/accessor/todo/grib_accessor_class_message_copy.cc
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = unpack_string;string_length
-   IMPLEMENTS = byte_count
-   IMPLEMENTS = init;dump;get_native_type
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static size_t string_length(grib_accessor*);
-static long byte_count(grib_accessor*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_message_copy
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in message_copy */
-} grib_accessor_message_copy;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_message_copy = {
-    &grib_accessor_class_gen,                      /* super */
-    "message_copy",                      /* name */
-    sizeof(grib_accessor_message_copy),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    &string_length,              /* get length of string */
-    0,                /* get number of values */
-    &byte_count,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_message_copy = &_grib_accessor_class_message_copy;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long length, grib_arguments* args)
-{
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->length = 0;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    grib_dump_string(dumper, a, NULL);
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_STRING;
-}
-
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    size_t slen = grib_handle_of_accessor(a)->buffer->ulength;
-    size_t i;
-    unsigned char* v = 0;
-
-    if (*len < slen) {
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-    v = grib_handle_of_accessor(a)->buffer->data;
-    /* replace unprintable characters with space */
-    for (i = 0; i < slen; i++)
-        if (v[i] > 126)
-            v[i] = 32;
-    memcpy(val, grib_handle_of_accessor(a)->buffer->data, slen);
-    val[i] = 0;
-
-    *len = slen;
-
-    return GRIB_SUCCESS;
-}
-
-static size_t string_length(grib_accessor* a)
-{
-    return grib_handle_of_accessor(a)->buffer->ulength;
-}
-
-static long byte_count(grib_accessor* a)
-{
-    return a->length;
-}
diff --git a/src/accessor/todo/grib_accessor_class_multdouble.cc b/src/accessor/todo/grib_accessor_class_multdouble.cc
deleted file mode 100644
index ac5771627..000000000
--- a/src/accessor/todo/grib_accessor_class_multdouble.cc
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_double
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = init
-   MEMBERS    = const char* val
-   MEMBERS    = double multiplier
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_multdouble
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in multdouble */
-    const char* val;
-    double multiplier;
-} grib_accessor_multdouble;
-
-extern grib_accessor_class* grib_accessor_class_double;
-
-static grib_accessor_class _grib_accessor_class_multdouble = {
-    &grib_accessor_class_double,                      /* super */
-    "multdouble",                      /* name */
-    sizeof(grib_accessor_multdouble),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_multdouble = &_grib_accessor_class_multdouble;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_multdouble* self = (grib_accessor_multdouble*)a;
-    int n = 0;
-
-    self->val = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->multiplier = grib_arguments_get_double(grib_handle_of_accessor(a), c, n++);
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    const grib_accessor_multdouble* self = (grib_accessor_multdouble*)a;
-    int ret = GRIB_SUCCESS;
-    double value = 0;
-
-    ret = grib_get_double_internal(grib_handle_of_accessor(a), self->val, &value);
-    if (ret != GRIB_SUCCESS)
-        return ret;
-
-    *val = value * self->multiplier;
-
-    *len = 1;
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_non_alpha.cc b/src/accessor/todo/grib_accessor_class_non_alpha.cc
deleted file mode 100644
index 821f2311f..000000000
--- a/src/accessor/todo/grib_accessor_class_non_alpha.cc
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = unpack_string
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = init;dump;string_length
-   IMPLEMENTS = value_count
-   IMPLEMENTS = next_offset
-   IMPLEMENTS = get_native_type
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static size_t string_length(grib_accessor*);
-static long next_offset(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_non_alpha
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in non_alpha */
-} grib_accessor_non_alpha;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_non_alpha = {
-    &grib_accessor_class_gen,                      /* super */
-    "non_alpha",                      /* name */
-    sizeof(grib_accessor_non_alpha),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    &next_offset,                /* next_offset */
-    &string_length,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_non_alpha = &_grib_accessor_class_non_alpha;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    grib_buffer* buffer = grib_handle_of_accessor(a)->buffer;
-    size_t i            = 0;
-    unsigned char* v;
-
-    v = buffer->data + a->offset;
-    i = 0;
-    while ((*v < 33 || *v > 126) && i <= buffer->ulength) {
-        v++;
-        i++;
-    }
-    a->length = i;
-
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    *count = 1;
-    return 0;
-}
-
-static size_t string_length(grib_accessor* a)
-{
-    return a->length;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    grib_dump_string(dumper, a, NULL);
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_STRING;
-}
-
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    grib_handle* hand = grib_handle_of_accessor(a);
-    long i = 0;
-
-    if (*len < (a->length + 1)) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "unpack_string: Wrong size (%lu) for %s, it contains %ld values",
-                *len, a->name, a->length + 1);
-        *len = a->length + 1;
-        return GRIB_BUFFER_TOO_SMALL;
-    }
-
-    for (i = 0; i < a->length; i++) {
-        val[i] = hand->buffer->data[a->offset + i];
-    }
-    val[i] = 0;
-    *len = i;
-    return GRIB_SUCCESS;
-}
-
-static int unpack_long(grib_accessor* a, long* v, size_t* len)
-{
-    char val[1024] = {0,};
-    size_t l   = sizeof(val);
-    size_t i   = 0;
-    char* last = NULL;
-    int err    = grib_unpack_string(a, val, &l);
-
-    if (err)
-        return err;
-
-    i = 0;
-    while (i < l - 1 && val[i] == ' ')
-        i++;
-
-    if (val[i] == 0) {
-        *v = 0;
-        return 0;
-    }
-    if (val[i + 1] == ' ' && i < l - 2)
-        val[i + 1] = 0;
-
-    *v = strtol(val, &last, 10);
-
-    return GRIB_SUCCESS;
-}
-
-static int unpack_double(grib_accessor* a, double* v, size_t* len)
-{
-    char val[1024];
-    size_t l   = sizeof(val);
-    char* last = NULL;
-    grib_unpack_string(a, val, &l);
-
-    *v = strtod(val, &last);
-
-    if (*last == 0) {
-        return GRIB_SUCCESS;
-    }
-
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static long next_offset(grib_accessor* a)
-{
-    return a->offset + a->length;
-}
diff --git a/src/accessor/todo/grib_accessor_class_number_of_coded_values.cc b/src/accessor/todo/grib_accessor_class_number_of_coded_values.cc
deleted file mode 100644
index 14ef832d7..000000000
--- a/src/accessor/todo/grib_accessor_class_number_of_coded_values.cc
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/*****************************
- * Enrico Fucile
- ****************************/
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = init
-   MEMBERS = const char* numberOfValues
-   MEMBERS = const char* bitsPerValue
-   MEMBERS = const char* offsetBeforeData
-   MEMBERS = const char* offsetAfterData
-   MEMBERS = const char* unusedBits
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_number_of_coded_values
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in number_of_coded_values */
-    const char* numberOfValues;
-    const char* bitsPerValue;
-    const char* offsetBeforeData;
-    const char* offsetAfterData;
-    const char* unusedBits;
-} grib_accessor_number_of_coded_values;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_number_of_coded_values = {
-    &grib_accessor_class_long,                      /* super */
-    "number_of_coded_values",                      /* name */
-    sizeof(grib_accessor_number_of_coded_values),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_number_of_coded_values = &_grib_accessor_class_number_of_coded_values;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    int n                                      = 0;
-    grib_accessor_number_of_coded_values* self = (grib_accessor_number_of_coded_values*)a;
-    self->bitsPerValue                         = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->offsetBeforeData                     = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->offsetAfterData                      = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->unusedBits                           = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->numberOfValues                       = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
-    a->length = 0;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    int ret               = GRIB_SUCCESS;
-    long bpv              = 0;
-    long offsetBeforeData = 0, offsetAfterData = 0, unusedBits = 0, numberOfValues;
-
-    grib_accessor_number_of_coded_values* self = (grib_accessor_number_of_coded_values*)a;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->bitsPerValue, &bpv)) != GRIB_SUCCESS)
-        return ret;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->offsetBeforeData, &offsetBeforeData)) != GRIB_SUCCESS)
-        return ret;
-
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->offsetAfterData, &offsetAfterData)) != GRIB_SUCCESS)
-        return ret;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->unusedBits, &unusedBits)) != GRIB_SUCCESS)
-        return ret;
-
-    if (bpv != 0) {
-        grib_context_log(a->context, GRIB_LOG_DEBUG, "grib_accessor_number_of_coded_values: offsetAfterData=%ld offsetBeforeData=%ld unusedBits=%ld bpv=%ld\n",
-                         offsetAfterData, offsetBeforeData, unusedBits, bpv);
-        DEBUG_ASSERT(offsetAfterData > offsetBeforeData);
-        *val = ((offsetAfterData - offsetBeforeData) * 8 - unusedBits) / bpv;
-    }
-    else {
-        if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->numberOfValues, &numberOfValues)) != GRIB_SUCCESS)
-            return ret;
-
-        *val = numberOfValues;
-    }
-
-    return ret;
-}
diff --git a/src/accessor/todo/grib_accessor_class_number_of_points.cc b/src/accessor/todo/grib_accessor_class_number_of_points.cc
deleted file mode 100644
index b3d1eade2..000000000
--- a/src/accessor/todo/grib_accessor_class_number_of_points.cc
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/****************************************
- * Enrico Fucile
- *************************************/
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = init
-   MEMBERS = const char* ni
-   MEMBERS = const char* nj
-   MEMBERS = const char* plpresent
-   MEMBERS = const char* pl
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_number_of_points
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in number_of_points */
-    const char* ni;
-    const char* nj;
-    const char* plpresent;
-    const char* pl;
-} grib_accessor_number_of_points;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_number_of_points = {
-    &grib_accessor_class_long,                      /* super */
-    "number_of_points",                      /* name */
-    sizeof(grib_accessor_number_of_points),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_number_of_points = &_grib_accessor_class_number_of_points;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    int n = 0;
-    grib_handle* hand = grib_handle_of_accessor(a);
-
-    grib_accessor_number_of_points* self = (grib_accessor_number_of_points*)a;
-    self->ni                             = grib_arguments_get_name(hand, c, n++);
-    self->nj                             = grib_arguments_get_name(hand, c, n++);
-    self->plpresent                      = grib_arguments_get_name(hand, c, n++);
-    self->pl                             = grib_arguments_get_name(hand, c, n++);
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
-    a->length = 0;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_number_of_points* self = (grib_accessor_number_of_points*)a;
-
-    int ret = GRIB_SUCCESS;
-    long ni = 0, nj = 0, plpresent = 0;
-    size_t plsize = 0;
-    long* pl = NULL;
-    int i = 0;
-    grib_context* c = a->context;
-    grib_handle* hand = grib_handle_of_accessor(a);
-
-    if ((ret = grib_get_long_internal(hand, self->ni, &ni)) != GRIB_SUCCESS)
-        return ret;
-
-    if ((ret = grib_get_long_internal(hand, self->nj, &nj)) != GRIB_SUCCESS)
-        return ret;
-
-    if (self->plpresent &&
-        ((ret = grib_get_long_internal(hand, self->plpresent, &plpresent)) != GRIB_SUCCESS))
-        return ret;
-
-    if (grib_is_missing(hand, self->nj, &ret) && ret == GRIB_SUCCESS) {
-        grib_context_log(c, GRIB_LOG_ERROR, "grib_accessor_class_number_of_points: Key %s cannot be 'missing'!", self->nj);
-        return GRIB_GEOCALCULUS_PROBLEM;
-    }
-
-    if (nj == 0) {
-        grib_context_log(c, GRIB_LOG_ERROR, "grib_accessor_class_number_of_points: Key %s cannot be 0!", self->nj);
-        return GRIB_GEOCALCULUS_PROBLEM;
-    }
-
-    if (plpresent) {
-        /*reduced*/
-        plsize = nj;
-        pl     = (long*)grib_context_malloc(c, sizeof(long) * plsize);
-        grib_get_long_array_internal(hand, self->pl, pl, &plsize);
-        *val = 0;
-        for (i = 0; i < plsize; i++)
-            *val += pl[i];
-        grib_context_free(c, pl);
-    }
-    else {
-        /*regular*/
-        *val = ni * nj;
-    }
-
-    return ret;
-}
diff --git a/src/accessor/todo/grib_accessor_class_number_of_values.cc b/src/accessor/todo/grib_accessor_class_number_of_values.cc
deleted file mode 100644
index fb1aff779..000000000
--- a/src/accessor/todo/grib_accessor_class_number_of_values.cc
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/**********************************
- *  Enrico Fucile
- **********************************/
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = init
-   MEMBERS = const char* values
-   MEMBERS = const char* bitsPerValue
-   MEMBERS = const char* numberOfPoints
-   MEMBERS = const char* bitmapPresent
-   MEMBERS = const char* bitmap
-   MEMBERS = const char* numberOfCodedValues
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_number_of_values
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in number_of_values */
-    const char* values;
-    const char* bitsPerValue;
-    const char* numberOfPoints;
-    const char* bitmapPresent;
-    const char* bitmap;
-    const char* numberOfCodedValues;
-} grib_accessor_number_of_values;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_number_of_values = {
-    &grib_accessor_class_long,                      /* super */
-    "number_of_values",                      /* name */
-    sizeof(grib_accessor_number_of_values),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_number_of_values = &_grib_accessor_class_number_of_values;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    int n                                = 0;
-    grib_accessor_number_of_values* self = (grib_accessor_number_of_values*)a;
-    grib_handle* hand                    = grib_handle_of_accessor(a);
-
-    self->values              = grib_arguments_get_name(hand, c, n++);
-    self->bitsPerValue        = grib_arguments_get_name(hand, c, n++);
-    self->numberOfPoints      = grib_arguments_get_name(hand, c, n++);
-    self->bitmapPresent       = grib_arguments_get_name(hand, c, n++);
-    self->bitmap              = grib_arguments_get_name(hand, c, n++);
-    self->numberOfCodedValues = grib_arguments_get_name(hand, c, n++);
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-
-    a->length = 0;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_number_of_values* self = (grib_accessor_number_of_values*)a;
-    int ret                              = GRIB_SUCCESS, i;
-    long npoints = 0, bitmap_present = 0;
-    size_t size = 0;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->numberOfPoints, &npoints)) != GRIB_SUCCESS)
-        return ret;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->bitmapPresent, &bitmap_present)) != GRIB_SUCCESS)
-        return ret;
-
-    if (bitmap_present) {
-        double* bitmap;
-        size   = npoints;
-        bitmap = (double*)grib_context_malloc(a->context, sizeof(double) * size);
-        if ((ret = grib_get_double_array_internal(grib_handle_of_accessor(a), self->bitmap, bitmap, &size)) != GRIB_SUCCESS) {
-            grib_context_free(a->context, bitmap);
-            return ret;
-        }
-        *val = 0;
-        for (i = 0; i < size; i++)
-            if (bitmap[i] != 0)
-                (*val)++;
-
-        grib_context_free(a->context, bitmap);
-    }
-    else {
-        *val = npoints;
-    }
-
-    return ret;
-}
diff --git a/src/accessor/todo/grib_accessor_class_number_of_values_data_raw_packing.cc b/src/accessor/todo/grib_accessor_class_number_of_values_data_raw_packing.cc
deleted file mode 100644
index 5652797ac..000000000
--- a/src/accessor/todo/grib_accessor_class_number_of_values_data_raw_packing.cc
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-/*****************************
- *  Enrico Fucile
- ****************************/
-
-#include "grib_api_internal.h"
-#define PRECISION_32_IEEE 1
-#define PRECISION_64_IEEE 2
-#define PRECISION_128_IEEE 3
-
-#define COMPRESSION_NONE 0
-#define COMPRESSION_LZW 1
-
-#define PRE_PROCESSING_NONE 0
-#define PRE_PROCESSING_DIFFERENCE 1
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = init
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = get_native_type
-   MEMBERS=const char*   values
-   MEMBERS=const char*   precision
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_number_of_values_data_raw_packing
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in number_of_values_data_raw_packing */
-    const char*   values;
-    const char*   precision;
-} grib_accessor_number_of_values_data_raw_packing;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_number_of_values_data_raw_packing = {
-    &grib_accessor_class_gen,                      /* super */
-    "number_of_values_data_raw_packing",                      /* name */
-    sizeof(grib_accessor_number_of_values_data_raw_packing),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_number_of_values_data_raw_packing = &_grib_accessor_class_number_of_values_data_raw_packing;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long v, grib_arguments* args)
-{
-    int n                                                 = 0;
-    grib_accessor_number_of_values_data_raw_packing* self = (grib_accessor_number_of_values_data_raw_packing*)a;
-
-    self->values    = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
-    self->precision = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->length = 0;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    int err                                               = 0;
-    grib_accessor_number_of_values_data_raw_packing* self = (grib_accessor_number_of_values_data_raw_packing*)a;
-    grib_accessor* adata                                  = NULL;
-    long precision                                        = 0;
-    int bytes                                             = 0;
-    long byte_count                                       = 0;
-
-    adata = grib_find_accessor(grib_handle_of_accessor(a), self->values);
-    Assert(adata != NULL);
-    byte_count = grib_byte_count(adata);
-
-    if ((err = grib_get_long_internal(grib_handle_of_accessor(a), self->precision, &precision)) != GRIB_SUCCESS)
-        return err;
-
-    switch (precision) {
-        case 1:
-            bytes = 4;
-            break;
-
-        case 2:
-            bytes = 8;
-            break;
-
-        default:
-            return GRIB_NOT_IMPLEMENTED;
-    }
-
-    *val = byte_count / bytes;
-
-    return err;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_LONG;
-}
diff --git a/src/accessor/todo/grib_accessor_class_octahedral_gaussian.cc b/src/accessor/todo/grib_accessor_class_octahedral_gaussian.cc
deleted file mode 100644
index 8035c9ab0..000000000
--- a/src/accessor/todo/grib_accessor_class_octahedral_gaussian.cc
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = init
-   IMPLEMENTS = pack_long
-   MEMBERS=const char*                  N
-   MEMBERS=const char*                  Ni
-   MEMBERS=const char*                  plpresent
-   MEMBERS=const char*                  pl
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_octahedral_gaussian
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in octahedral_gaussian */
-    const char*                  N;
-    const char*                  Ni;
-    const char*                  plpresent;
-    const char*                  pl;
-} grib_accessor_octahedral_gaussian;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_octahedral_gaussian = {
-    &grib_accessor_class_long,                      /* super */
-    "octahedral_gaussian",                      /* name */
-    sizeof(grib_accessor_octahedral_gaussian),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_octahedral_gaussian = &_grib_accessor_class_octahedral_gaussian;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_octahedral_gaussian* self = (grib_accessor_octahedral_gaussian*)a;
-    int n                                   = 0;
-    grib_handle* hand                       = grib_handle_of_accessor(a);
-
-    self->N         = grib_arguments_get_name(hand, c, n++);
-    self->Ni        = grib_arguments_get_name(hand, c, n++);
-    self->plpresent = grib_arguments_get_name(hand, c, n++);
-    self->pl        = grib_arguments_get_name(hand, c, n++);
-}
-
-/* Returns 1 (=true) if input pl array is Octahedral, 0 otherwise.
- * Possible cases for the deltas in an octahedral pl array:
- *  +4 .. +4        Top part, above equator
- *  +4 .. 0         Top part, above and including equator
- *  +4.. 0  -4..    Middle part, above, equator and below
- *  0 -4..          Equator and below
- *  -4 ..-4         All below equator
- * Anything else is considered not octahedral
- */
-static int is_pl_octahedral(const long pl[], size_t size)
-{
-    long i;
-    long prev_diff = -1;
-    for (i = 1; i < size; ++i) {
-        const long diff = pl[i] - pl[i - 1];
-        if (diff == 0) {
-            /* prev must be +4 or undef */
-            if (!(prev_diff == +4 || i == 1)) {
-                return 0;
-            }
-        }
-        else {
-            if (labs(diff) != 4) {
-                return 0;
-            }
-            if (diff == +4) {
-                /* prev must be +4 or undef */
-                if (!(prev_diff == +4 || i == 1)) {
-                    return 0;
-                }
-            }
-            if (diff == -4) {
-                /* prev must be 0, -4 or undef */
-                if (!(prev_diff == -4 || prev_diff == 0 || i == 1)) {
-                    return 0;
-                }
-            }
-        }
-        prev_diff = diff;
-    }
-    return 1; /* it's octahedral */
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_octahedral_gaussian* self = (grib_accessor_octahedral_gaussian*)a;
-    int ret                                 = GRIB_SUCCESS;
-    long Ni;
-    long plpresent    = 0;
-    long* pl          = NULL; /* pl array */
-    size_t plsize     = 0;
-    grib_handle* hand = grib_handle_of_accessor(a);
-
-    grib_context* c = a->context;
-
-    if ((ret = grib_get_long_internal(hand, self->Ni, &Ni)) != GRIB_SUCCESS)
-        return ret;
-
-    /* If Ni is not missing, then this is a plain gaussian grid and not reduced. */
-    /* So it cannot be an octahedral grid */
-    if (Ni != GRIB_MISSING_LONG) {
-        *val = 0;
-        return GRIB_SUCCESS;
-    }
-
-    if ((ret = grib_get_long_internal(hand, self->plpresent, &plpresent)) != GRIB_SUCCESS)
-        return ret;
-    if (!plpresent) {
-        *val = 0; /* Not octahedral */
-        return GRIB_SUCCESS;
-    }
-
-    if ((ret = grib_get_size(hand, self->pl, &plsize)) != GRIB_SUCCESS)
-        return ret;
-    Assert(plsize); /* pl array must have at least one element */
-
-    pl = (long*)grib_context_malloc_clear(c, sizeof(long) * plsize);
-    if (!pl) {
-        return GRIB_OUT_OF_MEMORY;
-    }
-    if ((ret = grib_get_long_array_internal(hand, self->pl, pl, &plsize)) != GRIB_SUCCESS)
-        return ret;
-
-    /* pl[0] is guaranteed to exist. Have already asserted previously */
-    *val = is_pl_octahedral(pl, plsize);
-    grib_context_free(c, pl);
-
-    return ret;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    return GRIB_NOT_IMPLEMENTED;
-}
diff --git a/src/accessor/todo/grib_accessor_class_octet_number.cc b/src/accessor/todo/grib_accessor_class_octet_number.cc
deleted file mode 100644
index cce0e742b..000000000
--- a/src/accessor/todo/grib_accessor_class_octet_number.cc
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long;pack_long
-   IMPLEMENTS = init
-   MEMBERS=const char*                  left
-   MEMBERS=long                         right
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_octet_number
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in octet_number */
-    const char*                  left;
-    long                         right;
-} grib_accessor_octet_number;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_octet_number = {
-    &grib_accessor_class_long,                      /* super */
-    "octet_number",                      /* name */
-    sizeof(grib_accessor_octet_number),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_octet_number = &_grib_accessor_class_octet_number;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_octet_number* self = (grib_accessor_octet_number*)a;
-
-    int n = 0;
-    self->left  = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->right = grib_arguments_get_long(grib_handle_of_accessor(a), c, n++);
-
-    a->length = 0;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_octet_number* self = (grib_accessor_octet_number*)a;
-    int ret = GRIB_SUCCESS;
-    long offset;
-
-    offset = a->offset + self->right;
-
-    if ((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->left, offset)) != GRIB_SUCCESS)
-        return ret;
-
-    *val = offset;
-    *len = 1;
-
-    return ret;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_offset_file.cc b/src/accessor/todo/grib_accessor_class_offset_file.cc
deleted file mode 100644
index 8fd0a0018..000000000
--- a/src/accessor/todo/grib_accessor_class_offset_file.cc
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_double
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = unpack_string
-   IMPLEMENTS = init
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_offset_file
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in offset_file */
-} grib_accessor_offset_file;
-
-extern grib_accessor_class* grib_accessor_class_double;
-
-static grib_accessor_class _grib_accessor_class_offset_file = {
-    &grib_accessor_class_double,                      /* super */
-    "offset_file",                      /* name */
-    sizeof(grib_accessor_offset_file),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_offset_file = &_grib_accessor_class_offset_file;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->length = 0;
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    *val = (double)grib_handle_of_accessor(a)->offset;
-    *len = 1;
-    return GRIB_SUCCESS;
-}
-
-static int unpack_string(grib_accessor* a, char* v, size_t* len)
-{
-    double val = 0;
-    size_t l   = 1;
-    char repres[1024] = {0,};
-    int err = 0;
-    const char* cclass_name = a->cclass->name;
-
-    err = grib_unpack_double(a, &val, &l);
-    if (err) return err;
-
-    snprintf(repres, sizeof(repres), "%.0f", val);
-
-    l = strlen(repres) + 1;
-    if (l > *len) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
-                         cclass_name, a->name, l, *len);
-        *len = l;
-        return GRIB_BUFFER_TOO_SMALL;
-    }
-    grib_context_log(a->context, GRIB_LOG_DEBUG, "%s: Casting double %s to string", __func__, a->name);
-
-    *len = l;
-
-    strcpy(v, repres);
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_offset_values.cc b/src/accessor/todo/grib_accessor_class_offset_values.cc
deleted file mode 100644
index 012698f79..000000000
--- a/src/accessor/todo/grib_accessor_class_offset_values.cc
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/**********************************
- *  Enrico Fucile
- *********************************/
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_double
-   IMPLEMENTS = unpack_double; pack_double
-   IMPLEMENTS = init
-   MEMBERS = const char* values
-   MEMBERS = const char* missingValue
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_offset_values
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in offset_values */
-    const char* values;
-    const char* missingValue;
-} grib_accessor_offset_values;
-
-extern grib_accessor_class* grib_accessor_class_double;
-
-static grib_accessor_class _grib_accessor_class_offset_values = {
-    &grib_accessor_class_double,                      /* super */
-    "offset_values",                      /* name */
-    sizeof(grib_accessor_offset_values),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_offset_values = &_grib_accessor_class_offset_values;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* args)
-{
-    int n                             = 0;
-    grib_accessor_offset_values* self = (grib_accessor_offset_values*)a;
-    self->values                      = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
-    self->missingValue                = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
-    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
-    a->length = 0;
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    int ret = 0;
-    *val    = 0;
-    *len    = 1;
-    return ret;
-}
-
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    double* values            = NULL;
-    size_t size               = 0;
-    double missingValue       = 0;
-    long missingValuesPresent = 0;
-    int ret = 0, i = 0;
-    grib_accessor_offset_values* self = (grib_accessor_offset_values*)a;
-    grib_context* c                   = a->context;
-    grib_handle* h                    = grib_handle_of_accessor(a);
-
-    if (*val == 0)
-        return GRIB_SUCCESS;
-
-    if ((ret = grib_get_double_internal(h, self->missingValue, &missingValue)) != GRIB_SUCCESS) {
-        return ret;
-    }
-    if ((ret = grib_get_long_internal(h, "missingValuesPresent", &missingValuesPresent)) != GRIB_SUCCESS) {
-        return ret;
-    }
-
-    if ((ret = grib_get_size(h, self->values, &size)) != GRIB_SUCCESS)
-        return ret;
-
-    values = (double*)grib_context_malloc(c, size * sizeof(double));
-    if (!values)
-        return GRIB_OUT_OF_MEMORY;
-
-    if ((ret = grib_get_double_array_internal(h, self->values, values, &size)) != GRIB_SUCCESS) {
-        grib_context_free(c, values);
-        return ret;
-    }
-
-    for (i = 0; i < size; i++) {
-        if (missingValuesPresent) {
-            if (values[i] != missingValue)
-                values[i] += *val;
-        }
-        else {
-            values[i] += *val;
-        }
-    }
-
-    if ((ret = grib_set_double_array_internal(h, self->values, values, size)) != GRIB_SUCCESS)
-        return ret;
-
-    grib_context_free(c, values);
-
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_pack_bufr_values.cc b/src/accessor/todo/grib_accessor_class_pack_bufr_values.cc
deleted file mode 100644
index a076e12ac..000000000
--- a/src/accessor/todo/grib_accessor_class_pack_bufr_values.cc
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = init;dump
-   IMPLEMENTS = unpack_string;unpack_string_array;unpack_long; unpack_double
-   IMPLEMENTS = pack_long; pack_double
-   IMPLEMENTS = value_count; destroy; get_native_type;
-   MEMBERS    = grib_accessor* data_accessor
-
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static int unpack_string_array(grib_accessor*, char**, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void destroy(grib_context*, grib_accessor*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_pack_bufr_values
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in pack_bufr_values */
-    grib_accessor* data_accessor;
-} grib_accessor_pack_bufr_values;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_pack_bufr_values = {
-    &grib_accessor_class_gen,                      /* super */
-    "pack_bufr_values",                      /* name */
-    sizeof(grib_accessor_pack_bufr_values),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    &destroy,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    &unpack_string_array,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_pack_bufr_values = &_grib_accessor_class_pack_bufr_values;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* params)
-{
-    char* key;
-    grib_accessor_pack_bufr_values* self = (grib_accessor_pack_bufr_values*)a;
-    key                                  = (char*)grib_arguments_get_name(grib_handle_of_accessor(a), params, 0);
-    self->data_accessor                  = grib_find_accessor(grib_handle_of_accessor(a), key);
-
-    a->length = 0;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-}
-
-static int unpack_string_array(grib_accessor* a, char** buffer, size_t* len)
-{
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static int unpack_string(grib_accessor* a, char* buffer, size_t* len)
-{
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    *count = 1;
-    return 0;
-}
-
-static void destroy(grib_context* context, grib_accessor* a)
-{
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_LONG;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_pack_bufr_values* self = (grib_accessor_pack_bufr_values*)a;
-    grib_accessor* data                  = (grib_accessor*)self->data_accessor;
-
-    return grib_pack_double(data, 0, 0);
-}
-
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_pack_bufr_values* self = (grib_accessor_pack_bufr_values*)a;
-    grib_accessor* data                  = (grib_accessor*)self->data_accessor;
-
-    return grib_pack_double(data, 0, 0);
-}
diff --git a/src/accessor/todo/grib_accessor_class_packing_type.cc b/src/accessor/todo/grib_accessor_class_packing_type.cc
deleted file mode 100644
index a9a4a2deb..000000000
--- a/src/accessor/todo/grib_accessor_class_packing_type.cc
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = unpack_string;pack_string
-   IMPLEMENTS = string_length
-   IMPLEMENTS = get_native_type
-   IMPLEMENTS = init
-   MEMBERS = const char* values
-   MEMBERS = const char* packing_type
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_string(grib_accessor*, const char*, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static size_t string_length(grib_accessor*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_packing_type
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in packing_type */
-    const char* values;
-    const char* packing_type;
-} grib_accessor_packing_type;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_packing_type = {
-    &grib_accessor_class_gen,                      /* super */
-    "packing_type",                      /* name */
-    sizeof(grib_accessor_packing_type),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    &string_length,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    &pack_string,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_packing_type = &_grib_accessor_class_packing_type;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* args)
-{
-    int n                              = 0;
-    grib_accessor_packing_type* self = (grib_accessor_packing_type*)a;
-    self->values                       = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
-    self->packing_type                 = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
-    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
-    a->length = 0;
-}
-
-static size_t string_length(grib_accessor* a)
-{
-    return 1024;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_STRING;
-}
-
-static int pack_string(grib_accessor*a, const char* sval, size_t* len)
-{
-    grib_accessor_packing_type* self = (grib_accessor_packing_type*)a;
-    grib_handle* h = grib_handle_of_accessor(a);
-    double* values = NULL;
-    grib_context* c = a->context;
-    size_t size = 0;
-    int err = 0;
-
-    if ((err = grib_get_size(h, self->values, &size)) != GRIB_SUCCESS)
-        return err;
-
-    values = (double*)grib_context_malloc(c, size * sizeof(double));
-    if (!values) return GRIB_OUT_OF_MEMORY;
-
-    if ((err = grib_get_double_array_internal(h, self->values, values, &size)) != GRIB_SUCCESS) {
-        grib_context_free(c, values);
-        return err;
-    }
-
-    if ((err = grib_set_string_internal(h, self->packing_type, sval, len)) != GRIB_SUCCESS) {
-        grib_context_free(c, values);
-        return err;
-    }
-
-    if ((err = grib_set_double_array_internal(h, self->values, values, size)) != GRIB_SUCCESS) {
-        grib_context_free(c, values);
-        return err;
-    }
-
-    grib_context_free(c, values);
-    return GRIB_SUCCESS;
-}
-
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    grib_accessor_packing_type* self = (grib_accessor_packing_type*)a;
-    grib_handle* h                   = grib_handle_of_accessor(a);
-
-    return grib_get_string(h, self->packing_type, val, len);
-}
diff --git a/src/accessor/todo/grib_accessor_class_pad.cc b/src/accessor/todo/grib_accessor_class_pad.cc
deleted file mode 100644
index 473a507e1..000000000
--- a/src/accessor/todo/grib_accessor_class_pad.cc
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/**************************************
- *  Enrico Fucile
- **************************************/
-
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_padding
-   IMPLEMENTS = init;preferred_size
-   MEMBERS    =grib_expression* expression
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static void init(grib_accessor*, const long, grib_arguments*);
-static size_t preferred_size(grib_accessor*, int);
-
-typedef struct grib_accessor_pad
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in bytes */
-    /* Members defined in padding */
-    /* Members defined in pad */
-    grib_expression* expression;
-} grib_accessor_pad;
-
-extern grib_accessor_class* grib_accessor_class_padding;
-
-static grib_accessor_class _grib_accessor_class_pad = {
-    &grib_accessor_class_padding,                      /* super */
-    "pad",                      /* name */
-    sizeof(grib_accessor_pad),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    &preferred_size,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_pad = &_grib_accessor_class_pad;
-
-/* END_CLASS_IMP */
-
-
-static size_t preferred_size(grib_accessor* a, int from_handle)
-{
-    grib_accessor_pad* self = (grib_accessor_pad*)a;
-
-    long length = 0;
-
-    grib_expression_evaluate_long(grib_handle_of_accessor(a), self->expression, &length);
-
-    return length > 0 ? length : 0;
-}
-
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    grib_accessor_pad* self = (grib_accessor_pad*)a;
-
-    self->expression = grib_arguments_get_expression(grib_handle_of_accessor(a), arg, 0);
-    a->length        = preferred_size(a, 1);
-}
diff --git a/src/accessor/todo/grib_accessor_class_padding.cc b/src/accessor/todo/grib_accessor_class_padding.cc
deleted file mode 100644
index 790ea9db2..000000000
--- a/src/accessor/todo/grib_accessor_class_padding.cc
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_bytes
-   IMPLEMENTS = init;update_size;resize; value_count
-   IMPLEMENTS = compare;string_length;byte_count
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static size_t string_length(grib_accessor*);
-static long byte_count(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static void update_size(grib_accessor*, size_t);
-static void resize(grib_accessor*,size_t);
-static int compare(grib_accessor*, grib_accessor*);
-
-typedef struct grib_accessor_padding
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in bytes */
-    /* Members defined in padding */
-} grib_accessor_padding;
-
-extern grib_accessor_class* grib_accessor_class_bytes;
-
-static grib_accessor_class _grib_accessor_class_padding = {
-    &grib_accessor_class_bytes,                      /* super */
-    "padding",                      /* name */
-    sizeof(grib_accessor_padding),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    &string_length,              /* get length of string */
-    &value_count,                /* get number of values */
-    &byte_count,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    &update_size,                /* update_size */
-    0,             /* preferred_size */
-    &resize,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    &compare,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_padding = &_grib_accessor_class_padding;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    a->flags |= GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC;
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-}
-
-static int compare(grib_accessor* a, grib_accessor* b)
-{
-    if (a->length != b->length)
-        return GRIB_COUNT_MISMATCH;
-    return GRIB_SUCCESS;
-}
-
-static void update_size(grib_accessor* a, size_t new_size)
-{
-    a->length = new_size;
-}
-
-static void resize(grib_accessor* a, size_t new_size)
-{
-    void* zero = grib_context_malloc_clear(a->context, new_size);
-
-    grib_buffer_replace(a, (const unsigned char*)zero, new_size,
-                        /*update_lengths=*/1, /*update_paddings=*/0);
-    grib_context_free(a->context, zero);
-
-    grib_context_log(a->context, GRIB_LOG_DEBUG, 
-                "grib_accessor_class_padding::resize new_size=%zu a->length=%ld %s %s",
-                new_size, a->length, a->cclass->name, a->name);
-    Assert(new_size == a->length);
-}
-
-static int value_count(grib_accessor* a, long* c)
-{
-    *c = a->length;
-    return 0;
-}
-
-static long byte_count(grib_accessor* a)
-{
-    return a->length;
-}
-
-static size_t string_length(grib_accessor* a)
-{
-    return (size_t)a->length;
-}
diff --git a/src/accessor/todo/grib_accessor_class_padto.cc b/src/accessor/todo/grib_accessor_class_padto.cc
deleted file mode 100644
index f6f9417b4..000000000
--- a/src/accessor/todo/grib_accessor_class_padto.cc
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/**************************************
- *  Enrico Fucile
- **************************************/
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_padding
-   IMPLEMENTS = init;preferred_size;dump
-   MEMBERS=grib_expression* expression
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static size_t preferred_size(grib_accessor*, int);
-
-typedef struct grib_accessor_padto
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in bytes */
-    /* Members defined in padding */
-    /* Members defined in padto */
-    grib_expression* expression;
-} grib_accessor_padto;
-
-extern grib_accessor_class* grib_accessor_class_padding;
-
-static grib_accessor_class _grib_accessor_class_padto = {
-    &grib_accessor_class_padding,                      /* super */
-    "padto",                      /* name */
-    sizeof(grib_accessor_padto),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    &preferred_size,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_padto = &_grib_accessor_class_padto;
-
-/* END_CLASS_IMP */
-
-
-static size_t preferred_size(grib_accessor* a, int from_handle)
-{
-    grib_accessor_padto* self = (grib_accessor_padto*)a;
-
-    long length = 0;
-    long theEnd;
-
-    grib_expression_evaluate_long(grib_handle_of_accessor(a), self->expression, &theEnd);
-
-    length = theEnd - a->offset;
-
-    /* printf("preferred_size: prefered: %ld current:%ld %s %s %ld\n", (long)length,(long)a->length,a->cclass->name,a->name,(long)a->offset); */
-
-    return length > 0 ? length : 0;
-}
-
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    grib_accessor_padto* self = (grib_accessor_padto*)a;
-
-    self->expression = grib_arguments_get_expression(grib_handle_of_accessor(a), arg, 0);
-    a->length        = preferred_size(a, 1);
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    /*grib_dump_string(dumper,a,NULL);*/
-}
diff --git a/src/accessor/todo/grib_accessor_class_padtoeven.cc b/src/accessor/todo/grib_accessor_class_padtoeven.cc
deleted file mode 100644
index c75e0e254..000000000
--- a/src/accessor/todo/grib_accessor_class_padtoeven.cc
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/**************************************
- *  Enrico Fucile
- **************************************/
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_padding
-   IMPLEMENTS = init;preferred_size
-   MEMBERS=const char*  section_offset
-   MEMBERS=const char*  section_length
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static void init(grib_accessor*, const long, grib_arguments*);
-static size_t preferred_size(grib_accessor*, int);
-
-typedef struct grib_accessor_padtoeven
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in bytes */
-    /* Members defined in padding */
-    /* Members defined in padtoeven */
-    const char*  section_offset;
-    const char*  section_length;
-} grib_accessor_padtoeven;
-
-extern grib_accessor_class* grib_accessor_class_padding;
-
-static grib_accessor_class _grib_accessor_class_padtoeven = {
-    &grib_accessor_class_padding,                      /* super */
-    "padtoeven",                      /* name */
-    sizeof(grib_accessor_padtoeven),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    &preferred_size,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_padtoeven = &_grib_accessor_class_padtoeven;
-
-/* END_CLASS_IMP */
-
-static size_t preferred_size(grib_accessor* a, int from_handle)
-{
-    grib_accessor_padtoeven* self = (grib_accessor_padtoeven*)a;
-    long offset                   = 0;
-    long length                   = 0;
-    long seclen;
-
-    grib_get_long_internal(grib_handle_of_accessor(a), self->section_offset, &offset);
-    grib_get_long_internal(grib_handle_of_accessor(a), self->section_length, &length);
-
-    if ((length % 2) && from_handle) {
-        //  grib_context_log(a->context,
-        //       GRIB_LOG_ERROR,"GRIB message has an odd length section (%ld, %s)",
-        //       (long)length,a->name);
-        return 0;
-    }
-
-    /* printf("EVEN %ld %ld\n",(long) a->offset,(long) offset);*/
-    seclen = a->offset - offset;
-
-    return (seclen % 2) ? 1 : 0;
-}
-
-static void init(grib_accessor* a, const long len, grib_arguments* args)
-{
-    grib_accessor_padtoeven* self = (grib_accessor_padtoeven*)a;
-
-    self->section_offset = grib_arguments_get_name(grib_handle_of_accessor(a), args, 0);
-    self->section_length = grib_arguments_get_name(grib_handle_of_accessor(a), args, 1);
-
-    a->length = preferred_size(a, 1);
-}
diff --git a/src/accessor/todo/grib_accessor_class_padtomultiple.cc b/src/accessor/todo/grib_accessor_class_padtomultiple.cc
deleted file mode 100644
index 3104cdf2f..000000000
--- a/src/accessor/todo/grib_accessor_class_padtomultiple.cc
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/**************************************
- *  Enrico Fucile
- **************************************/
-
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_padding
-   IMPLEMENTS = init;preferred_size
-   MEMBERS=grib_expression* begin
-   MEMBERS=grib_expression* multiple
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static void init(grib_accessor*, const long, grib_arguments*);
-static size_t preferred_size(grib_accessor*, int);
-
-typedef struct grib_accessor_padtomultiple
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in bytes */
-    /* Members defined in padding */
-    /* Members defined in padtomultiple */
-    grib_expression* begin;
-    grib_expression* multiple;
-} grib_accessor_padtomultiple;
-
-extern grib_accessor_class* grib_accessor_class_padding;
-
-static grib_accessor_class _grib_accessor_class_padtomultiple = {
-    &grib_accessor_class_padding,                      /* super */
-    "padtomultiple",                      /* name */
-    sizeof(grib_accessor_padtomultiple),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    &preferred_size,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_padtomultiple = &_grib_accessor_class_padtomultiple;
-
-/* END_CLASS_IMP */
-
-static size_t preferred_size(grib_accessor* a, int from_handle)
-{
-    grib_accessor_padtomultiple* self = (grib_accessor_padtomultiple*)a;
-    long padding                      = 0;
-    long begin                        = 0;
-    long multiple                     = 0;
-
-    grib_expression_evaluate_long(grib_handle_of_accessor(a), self->begin, &begin);
-    grib_expression_evaluate_long(grib_handle_of_accessor(a), self->multiple, &multiple);
-
-    padding = a->offset - begin;
-    padding = ((padding + multiple - 1) / multiple) * multiple - padding;
-
-    return padding == 0 ? multiple : padding;
-}
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    grib_accessor_padtomultiple* self = (grib_accessor_padtomultiple*)a;
-
-    self->begin    = grib_arguments_get_expression(grib_handle_of_accessor(a), arg, 0);
-    self->multiple = grib_arguments_get_expression(grib_handle_of_accessor(a), arg, 1);
-    a->length      = preferred_size(a, 1);
-}
diff --git a/src/accessor/todo/grib_accessor_class_position.cc b/src/accessor/todo/grib_accessor_class_position.cc
deleted file mode 100644
index 0f9565c37..000000000
--- a/src/accessor/todo/grib_accessor_class_position.cc
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = get_native_type
-   IMPLEMENTS = init;dump
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_position
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in position */
-} grib_accessor_position;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_position = {
-    &grib_accessor_class_gen,                      /* super */
-    "position",                      /* name */
-    sizeof(grib_accessor_position),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_position = &_grib_accessor_class_position;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    a->length = 0;
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->flags |= GRIB_ACCESSOR_FLAG_HIDDEN;
-    a->flags |= GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_LONG;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    grib_dump_long(dumper, a, NULL);
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    if (*len < 1) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s it contains %d values ", a->name, 1);
-        *len = 0;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-    *val = a->offset;
-    *len = 1;
-    return GRIB_SUCCESS;
-}
-
-// static int compare(grib_accessor* a, grib_accessor* b)
-// {
-//     if (a->offset != b->offset)
-//         return GRIB_OFFSET_MISMATCH;
-//     return GRIB_SUCCESS;
-// }
diff --git a/src/accessor/todo/grib_accessor_class_raw.cc b/src/accessor/todo/grib_accessor_class_raw.cc
deleted file mode 100644
index cdac6a100..000000000
--- a/src/accessor/todo/grib_accessor_class_raw.cc
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = get_native_type;init;update_size; pack_bytes
-   IMPLEMENTS = compare;unpack_bytes;byte_count;value_count
-   MEMBERS    = const char* totalLength
-   MEMBERS    = const char* sectionLength
-   MEMBERS    = long relativeOffset
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_bytes(grib_accessor*, const unsigned char*, size_t* len);
-static int unpack_bytes(grib_accessor*, unsigned char*, size_t* len);
-static long byte_count(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static void update_size(grib_accessor*, size_t);
-static int compare(grib_accessor*, grib_accessor*);
-
-typedef struct grib_accessor_raw
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in raw */
-    const char* totalLength;
-    const char* sectionLength;
-    long relativeOffset;
-} grib_accessor_raw;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_raw = {
-    &grib_accessor_class_gen,                      /* super */
-    "raw",                      /* name */
-    sizeof(grib_accessor_raw),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    &byte_count,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    &pack_bytes,                 /* pack_bytes */
-    &unpack_bytes,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    &update_size,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    &compare,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_raw = &_grib_accessor_class_raw;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    int n   = 0;
-    int err = 0;
-    long sectionLength;
-    grib_accessor_raw* self = (grib_accessor_raw*)a;
-    grib_expression* e;
-    grib_handle* hand = grib_handle_of_accessor(a);
-
-    a->length           = 0;
-    self->totalLength   = grib_arguments_get_name(hand, arg, n++);
-    self->sectionLength = grib_arguments_get_name(hand, arg, n++);
-
-    e   = grib_arguments_get_expression(hand, arg, n++);
-    err = grib_expression_evaluate_long(hand, e, &(self->relativeOffset));
-    if (err)
-        grib_context_log(hand->context, GRIB_LOG_ERROR, "Unable to evaluate relativeOffset");
-
-    grib_get_long(hand, self->sectionLength, &sectionLength);
-
-    a->length = sectionLength - self->relativeOffset;
-    if (a->length < 0)
-        a->length = 0;
-
-    /* Assert(a->length>=0); */
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_BYTES;
-}
-
-
-static int compare(grib_accessor* a, grib_accessor* b)
-{
-    int retval = GRIB_SUCCESS;
-
-    size_t alen = (size_t)grib_byte_count(a);
-    size_t blen = (size_t)grib_byte_count(b);
-
-    if (alen != blen)
-        return GRIB_COUNT_MISMATCH;
-
-    return retval;
-}
-
-static long byte_count(grib_accessor* a)
-{
-    return a->length;
-}
-
-static int value_count(grib_accessor* a, long* len)
-{
-    *len = a->length;
-    return 0;
-}
-
-static int unpack_bytes(grib_accessor* a, unsigned char* buffer, size_t* len)
-{
-    if (*len < a->length) {
-        *len = a->length;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-    *len = a->length;
-
-    memcpy(buffer, grib_handle_of_accessor(a)->buffer->data + a->offset, *len);
-
-    return GRIB_SUCCESS;
-}
-
-static void update_size(grib_accessor* a, size_t s)
-{
-    grib_context_log(a->context, GRIB_LOG_DEBUG, "updating size of %s old %ld new %ld", a->name, a->length, s);
-    a->length = s;
-    Assert(a->length >= 0);
-}
-
-void accessor_raw_set_length(grib_accessor* a, size_t len)
-{
-    a->length = len;
-}
-
-long accessor_raw_get_offset(grib_accessor* a)
-{
-    return a->offset;
-}
-
-static int pack_bytes(grib_accessor* a, const unsigned char* val, size_t* len)
-{
-    size_t length = *len;
-    long totalLength;
-    long sectionLength;
-    grib_handle* h          = grib_handle_of_accessor(a);
-    grib_accessor_raw* self = (grib_accessor_raw*)a;
-    long dlen               = length - a->length;
-
-    grib_get_long(h, self->totalLength, &totalLength);
-    totalLength += dlen;
-    grib_get_long(h, self->sectionLength, &sectionLength);
-    sectionLength += dlen;
-
-    grib_buffer_replace(a, val, length, 1, 1);
-
-    grib_set_long(h, self->totalLength, totalLength);
-    grib_set_long(h, self->sectionLength, sectionLength);
-    a->length = length;
-
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_rdbtime_guess_date.cc b/src/accessor/todo/grib_accessor_class_rdbtime_guess_date.cc
deleted file mode 100644
index 8a3bfa2a1..000000000
--- a/src/accessor/todo/grib_accessor_class_rdbtime_guess_date.cc
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long;pack_long
-   IMPLEMENTS = init
-   MEMBERS=const char* typicalYear
-   MEMBERS=const char* typicalMonth
-   MEMBERS=const char* typicalDay
-   MEMBERS=const char* rdbDay
-   MEMBERS=long yearOrMonth
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_rdbtime_guess_date
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in rdbtime_guess_date */
-    const char* typicalYear;
-    const char* typicalMonth;
-    const char* typicalDay;
-    const char* rdbDay;
-    long yearOrMonth;
-} grib_accessor_rdbtime_guess_date;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_rdbtime_guess_date = {
-    &grib_accessor_class_long,                      /* super */
-    "rdbtime_guess_date",                      /* name */
-    sizeof(grib_accessor_rdbtime_guess_date),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_rdbtime_guess_date = &_grib_accessor_class_rdbtime_guess_date;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_rdbtime_guess_date* self = (grib_accessor_rdbtime_guess_date*)a;
-    int n                                  = 0;
-
-    self->typicalYear  = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->typicalMonth = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->typicalDay   = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->rdbDay       = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->yearOrMonth  = grib_arguments_get_long(grib_handle_of_accessor(a), c, n++);
-
-    /* a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY; */
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_rdbtime_guess_date* self = (grib_accessor_rdbtime_guess_date*)a;
-    grib_handle* h                         = grib_handle_of_accessor(a);
-    int ret                                = 0;
-    long typicalYear, typicalMonth, typicalDay, rdbDay;
-    long rdbYear, rdbMonth;
-
-    ret = grib_get_long(h, self->typicalYear, &typicalYear);
-    if (ret)
-        return ret;
-    ret = grib_get_long(h, self->typicalMonth, &typicalMonth);
-    if (ret)
-        return ret;
-    ret = grib_get_long(h, self->typicalDay, &typicalDay);
-    if (ret)
-        return ret;
-    ret = grib_get_long(h, self->rdbDay, &rdbDay);
-    if (ret)
-        return ret;
-
-    if (rdbDay < typicalDay) {
-        if (typicalDay == 31 && typicalMonth == 12) {
-            rdbYear  = typicalYear + 1;
-            rdbMonth = 1;
-        }
-        else {
-            rdbYear  = typicalYear;
-            rdbMonth = typicalMonth + 1;
-        }
-    }
-    else {
-        rdbYear  = typicalYear;
-        rdbMonth = typicalMonth;
-    }
-
-    *val = self->yearOrMonth == 1 ? rdbYear : rdbMonth;
-    *len = 1;
-
-    return GRIB_SUCCESS;
-}
-
-static int pack_long(grib_accessor* a, const long* v, size_t* len)
-{
-    /* do nothing*/
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_reference_value_error.cc b/src/accessor/todo/grib_accessor_class_reference_value_error.cc
deleted file mode 100644
index 3cc4af20d..000000000
--- a/src/accessor/todo/grib_accessor_class_reference_value_error.cc
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/**************************************
- *  Enrico Fucile
- **************************************/
-
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_double
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = init
-   MEMBERS=const char*    referenceValue
-   MEMBERS=const char*    floatType
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_reference_value_error
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in reference_value_error */
-    const char*    referenceValue;
-    const char*    floatType;
-} grib_accessor_reference_value_error;
-
-extern grib_accessor_class* grib_accessor_class_double;
-
-static grib_accessor_class _grib_accessor_class_reference_value_error = {
-    &grib_accessor_class_double,                      /* super */
-    "reference_value_error",                      /* name */
-    sizeof(grib_accessor_reference_value_error),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_reference_value_error = &_grib_accessor_class_reference_value_error;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_reference_value_error* self = (grib_accessor_reference_value_error*)a;
-    int n                                     = 0;
-
-    self->referenceValue = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->floatType      = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->length = 0;
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_reference_value_error* self = (grib_accessor_reference_value_error*)a;
-    int ret                                   = 0;
-    double referenceValue                     = 0;
-
-    if ((ret = grib_get_double_internal(grib_handle_of_accessor(a),
-                                        self->referenceValue, &referenceValue)) != GRIB_SUCCESS)
-        return ret;
-
-    if (!strcmp(self->floatType, "ibm"))
-        *val = grib_ibmfloat_error(referenceValue);
-    else if (!strcmp(self->floatType, "ieee"))
-        *val = grib_ieeefloat_error(referenceValue);
-    else
-        Assert(1 == 0);
-
-    if (ret == GRIB_SUCCESS)
-        *len = 1;
-
-    return ret;
-}
diff --git a/src/accessor/todo/grib_accessor_class_round.cc b/src/accessor/todo/grib_accessor_class_round.cc
deleted file mode 100644
index 98fe2fda5..000000000
--- a/src/accessor/todo/grib_accessor_class_round.cc
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_evaluate
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = unpack_string
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-
-typedef struct grib_accessor_round
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in evaluate */
-    grib_arguments* arg;
-    /* Members defined in round */
-} grib_accessor_round;
-
-extern grib_accessor_class* grib_accessor_class_evaluate;
-
-static grib_accessor_class _grib_accessor_class_round = {
-    &grib_accessor_class_evaluate,                      /* super */
-    "round",                      /* name */
-    sizeof(grib_accessor_round),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    0,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_round = &_grib_accessor_class_round;
-
-/* END_CLASS_IMP */
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_round* self = (grib_accessor_round*)a;
-
-    int ret = GRIB_SUCCESS;
-
-    size_t replen             = 0;
-    double rounding_precision = 0;
-    double rounded            = 0;
-    double toround            = 0;
-
-    const char* oval = NULL;
-    oval             = grib_arguments_get_name(grib_handle_of_accessor(a), self->arg, 0);
-
-    if ((ret = grib_get_double_internal(grib_handle_of_accessor(a), oval, &toround)) != 0)
-        return ret;
-
-    rounding_precision = grib_arguments_get_long(grib_handle_of_accessor(a), self->arg, 1);
-
-    rounded = floor(rounding_precision * toround + 0.5) / rounding_precision;
-
-    *len = replen;
-
-    *val = rounded;
-
-    return ret;
-}
-
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    char result[1024];
-    int ret       = GRIB_SUCCESS;
-    size_t replen = 1;
-
-    double value = 0;
-
-    ret = unpack_double(a, &value, &replen);
-
-    snprintf(result, sizeof(result), "%.3f", value);
-
-    replen = strlen(result) + 1;
-
-    if (*len < replen) {
-        *len = replen;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    *len = replen;
-
-    snprintf(val, 1024, "%s", result);
-
-    return ret;
-}
diff --git a/src/accessor/todo/grib_accessor_class_scale.cc b/src/accessor/todo/grib_accessor_class_scale.cc
deleted file mode 100644
index 6fec75e94..000000000
--- a/src/accessor/todo/grib_accessor_class_scale.cc
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/**************************************
- *  Enrico Fucile
- **************************************/
-
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_double
-   IMPLEMENTS = unpack_double;pack_double;is_missing
-   IMPLEMENTS = pack_long
-   IMPLEMENTS = init
-   MEMBERS=const char*    value
-   MEMBERS=const char*    multiplier
-   MEMBERS=const char*    divisor
-   MEMBERS=const char*    truncating
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int is_missing(grib_accessor*);
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_scale
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in scale */
-    const char*    value;
-    const char*    multiplier;
-    const char*    divisor;
-    const char*    truncating;
-} grib_accessor_scale;
-
-extern grib_accessor_class* grib_accessor_class_double;
-
-static grib_accessor_class _grib_accessor_class_scale = {
-    &grib_accessor_class_double,                      /* super */
-    "scale",                      /* name */
-    sizeof(grib_accessor_scale),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    &is_missing,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_scale = &_grib_accessor_class_scale;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_scale* self = (grib_accessor_scale*)a;
-    int n                     = 0;
-
-    self->value      = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->multiplier = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->divisor    = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->truncating = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_scale* self = (grib_accessor_scale*)a;
-    int ret                   = 0;
-    long value                = 0;
-    long multiplier           = 0;
-    long divisor              = 0;
-
-    if (*len < 1) {
-        ret = GRIB_ARRAY_TOO_SMALL;
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "Accessor %s cannot gather value for %s and/or %s",
-                         a->name, self->multiplier, self->divisor);
-        return ret;
-    }
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->divisor, &divisor)) != GRIB_SUCCESS)
-        return ret;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->multiplier, &multiplier)) != GRIB_SUCCESS)
-        return ret;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->value, &value)) != GRIB_SUCCESS)
-        return ret;
-
-    if (value == GRIB_MISSING_LONG)
-        *val = GRIB_MISSING_DOUBLE;
-    else
-        *val = ((double)(value * multiplier)) / divisor;
-
-    if (ret == GRIB_SUCCESS)
-        *len = 1;
-
-    return ret;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    const double dval = (double)*val;
-    return pack_double(a, &dval, len);
-}
-
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_scale* self = (grib_accessor_scale*)a;
-    int ret                   = 0;
-
-    long value      = 0;
-    long divisor    = 0;
-    long multiplier = 0;
-    long truncating = 0;
-    double x;
-
-    ret = grib_get_long_internal(grib_handle_of_accessor(a), self->divisor, &divisor);
-    if (ret != GRIB_SUCCESS) return ret;
-
-    ret = grib_get_long_internal(grib_handle_of_accessor(a), self->multiplier, &multiplier);
-    if (ret != GRIB_SUCCESS) return ret;
-
-    if (self->truncating) {
-        ret = grib_get_long_internal(grib_handle_of_accessor(a), self->truncating, &truncating);
-        if (ret != GRIB_SUCCESS) return ret;
-    }
-
-    if (multiplier == 0) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "Accessor %s: cannot divide by a zero multiplier %s",
-                         a->name, self->multiplier);
-        return GRIB_ENCODING_ERROR;
-    }
-
-    x = *val * (double)divisor / (double)multiplier;
-    if (*val == GRIB_MISSING_DOUBLE)
-        value = GRIB_MISSING_LONG;
-    else if (truncating) {
-        value = (long)x;
-    }
-    else {
-        value = x > 0 ? (long)(x + 0.5) : (long)(x - 0.5);
-    }
-
-    ret = grib_set_long_internal(grib_handle_of_accessor(a), self->value, value);
-    if (ret)
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "Accessor %s: cannot pack value for %s (%s)\n",
-                         a->name, self->value, grib_get_error_message(ret));
-
-    if (ret == GRIB_SUCCESS)
-        *len = 1;
-
-    return ret;
-}
-
-static int is_missing(grib_accessor* a)
-{
-    grib_accessor_scale* self = (grib_accessor_scale*)a;
-    grib_accessor* av         = grib_find_accessor(grib_handle_of_accessor(a), self->value);
-
-    if (!av)
-        return GRIB_NOT_FOUND;
-    return grib_is_missing_internal(av);
-    //     int ret=0;
-    //     long value=0;
-    //     if((ret = grib_get_long_internal(grib_handle_of_accessor(a),self->value, &value))!= GRIB_SUCCESS){
-    //         grib_context_log(a->context, GRIB_LOG_ERROR,
-    //         "Accessor %s cannot gather value for %s error %d \n", a->name,
-    //         self->value, ret);
-    //         return 0;
-    //     }
-    //     return (value == GRIB_MISSING_LONG);
-}
diff --git a/src/accessor/todo/grib_accessor_class_scale_values.cc b/src/accessor/todo/grib_accessor_class_scale_values.cc
deleted file mode 100644
index 8c4b33fcb..000000000
--- a/src/accessor/todo/grib_accessor_class_scale_values.cc
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/**********************************
- *  Enrico Fucile
- *********************************/
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_double
-   IMPLEMENTS = unpack_double; pack_double
-   IMPLEMENTS = init
-   MEMBERS = const char* values
-   MEMBERS = const char* missingValue
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_scale_values
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in scale_values */
-    const char* values;
-    const char* missingValue;
-} grib_accessor_scale_values;
-
-extern grib_accessor_class* grib_accessor_class_double;
-
-static grib_accessor_class _grib_accessor_class_scale_values = {
-    &grib_accessor_class_double,                      /* super */
-    "scale_values",                      /* name */
-    sizeof(grib_accessor_scale_values),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_scale_values = &_grib_accessor_class_scale_values;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* args)
-{
-    int n                            = 0;
-    grib_accessor_scale_values* self = (grib_accessor_scale_values*)a;
-    self->values                     = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
-    self->missingValue               = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
-    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
-    a->length = 0;
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    int ret = 0;
-    *val    = 1;
-    *len    = 1;
-    return ret;
-}
-
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    double* values            = NULL;
-    double missingValue       = 0;
-    long missingValuesPresent = 0;
-    size_t size               = 0;
-    int ret = 0, i = 0;
-    grib_accessor_scale_values* self = (grib_accessor_scale_values*)a;
-    const grib_context* c            = a->context;
-    grib_handle* h                   = grib_handle_of_accessor(a);
-
-    if (*val == 1)
-        return GRIB_SUCCESS;
-
-    if ((ret = grib_get_double_internal(h, self->missingValue, &missingValue)) != GRIB_SUCCESS) {
-        return ret;
-    }
-    if ((ret = grib_get_long_internal(h, "missingValuesPresent", &missingValuesPresent)) != GRIB_SUCCESS) {
-        return ret;
-    }
-
-    if ((ret = grib_get_size(h, self->values, &size)) != GRIB_SUCCESS)
-        return ret;
-
-    values = (double*)grib_context_malloc(c, size * sizeof(double));
-    if (!values)
-        return GRIB_OUT_OF_MEMORY;
-
-    if ((ret = grib_get_double_array_internal(h, self->values, values, &size)) != GRIB_SUCCESS) {
-        grib_context_free(c, values);
-        return ret;
-    }
-
-    for (i = 0; i < size; i++) {
-        if (missingValuesPresent) {
-            if (values[i] != missingValue)
-                values[i] *= *val;
-        }
-        else {
-            values[i] *= *val;
-        }
-    }
-
-    if ((ret = grib_set_double_array_internal(h, self->values, values, size)) != GRIB_SUCCESS) {
-        grib_context_free(c, values);
-        return ret;
-    }
-
-    grib_context_free(c, values);
-
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_section.cc b/src/accessor/todo/grib_accessor_class_section.cc
deleted file mode 100644
index f9c8857a7..000000000
--- a/src/accessor/todo/grib_accessor_class_section.cc
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = next_offset;byte_count
-   IMPLEMENTS = destroy;sub_section
-   IMPLEMENTS = get_native_type
-   IMPLEMENTS = init;dump;update_size
-   IMPLEMENTS = next
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static grib_section* sub_section(grib_accessor* a);
-static int get_native_type(grib_accessor*);
-static long byte_count(grib_accessor*);
-static long next_offset(grib_accessor*);
-static void destroy(grib_context*, grib_accessor*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static void update_size(grib_accessor*, size_t);
-static grib_accessor* next(grib_accessor*, int);
-
-typedef struct grib_accessor_section
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in section */
-} grib_accessor_section;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_section = {
-    &grib_accessor_class_gen,                      /* super */
-    "section",                      /* name */
-    sizeof(grib_accessor_section),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    &destroy,                    /* destroy */
-    &dump,                       /* dump */
-    &next_offset,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    &byte_count,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    &sub_section,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    &update_size,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    &next,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_section = &_grib_accessor_class_section;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    a->sub_section = grib_section_create(grib_handle_of_accessor(a), a);
-    a->length      = 0;
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    grib_dump_section(dumper, a, a->sub_section->block);
-}
-
-static long byte_count(grib_accessor* a)
-{
-    if (!a->length || grib_handle_of_accessor(a)->loader) {
-        if (a->name[1] == '_')
-            return 0;
-
-        /* printf("adjusting sizes SECTION %s is %ld %ld\n",a->name,(long)a->offset,(long)a->length); */
-        grib_section_adjust_sizes(a->sub_section, grib_handle_of_accessor(a)->loader != NULL, 0);
-        /* printf("                SECTION %s is %ld %ld\n",a->name,(long)a->offset,(long)a->length);  */
-    }
-
-    /* printf("SECTION %s is %ld %d\n",a->name,a->length,a->sub_section->aclength != NULL);  */
-    return a->length;
-}
-
-static long next_offset(grib_accessor* a)
-{
-    return a->offset + byte_count(a);
-}
-
-static void destroy(grib_context* ct, grib_accessor* a)
-{
-    grib_section_delete(ct, a->sub_section);
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_SECTION;
-}
-
-static grib_section* sub_section(grib_accessor* a)
-{
-    return a->sub_section;
-}
-
-static void update_size(grib_accessor* a, size_t length)
-{
-    size_t size = 1;
-    long len    = length;
-    Assert(length <= 0x7fffffff);
-    if (a->sub_section->aclength) {
-        int e = grib_pack_long(a->sub_section->aclength, &len, &size);
-        Assert(e == GRIB_SUCCESS);
-        // printf("update_length %s %ld %ld\n", a->sub_section->aclength->name,
-        //        (long)a->sub_section->aclength->offset,
-        //        (long)a->sub_section->aclength->length);
-    }
-
-    a->sub_section->length = a->length = length;
-    a->sub_section->padding            = 0;
-
-    // printf("update_size %s %ld\n", a->name, a->length);
-
-    Assert(a->length >= 0);
-}
-
-static grib_accessor* next(grib_accessor* a, int explore)
-{
-    grib_accessor* next = NULL;
-    if (explore) {
-        next = a->sub_section->block->first;
-        if (!next)
-            next = a->next;
-    }
-    else {
-        next = a->next;
-    }
-    if (!next) {
-        if (a->parent->owner)
-            next = a->parent->owner->cclass->next(a->parent->owner, 0);
-    }
-    return next;
-}
diff --git a/src/accessor/todo/grib_accessor_class_section_length.cc b/src/accessor/todo/grib_accessor_class_section_length.cc
deleted file mode 100644
index 4e5957e71..000000000
--- a/src/accessor/todo/grib_accessor_class_section_length.cc
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_unsigned
-   IMPLEMENTS = init;dump
-   IMPLEMENTS = value_count
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int value_count(grib_accessor*, long*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_section_length
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in unsigned */
-    long nbytes;
-    grib_arguments* arg;
-    /* Members defined in section_length */
-} grib_accessor_section_length;
-
-extern grib_accessor_class* grib_accessor_class_unsigned;
-
-static grib_accessor_class _grib_accessor_class_section_length = {
-    &grib_accessor_class_unsigned,                      /* super */
-    "section_length",                      /* name */
-    sizeof(grib_accessor_section_length),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_section_length = &_grib_accessor_class_section_length;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    a->parent->aclength = a;
-    a->length           = len;
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->flags |= GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC;
-    Assert(a->length >= 0);
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    grib_dump_long(dumper, a, NULL);
-}
-
-static int value_count(grib_accessor* a, long* c)
-{
-    *c = 1;
-    return 0;
-}
diff --git a/src/accessor/todo/grib_accessor_class_section_padding.cc b/src/accessor/todo/grib_accessor_class_section_padding.cc
deleted file mode 100644
index 682946df5..000000000
--- a/src/accessor/todo/grib_accessor_class_section_padding.cc
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_padding
-   IMPLEMENTS = init;preferred_size
-   MEMBERS    = int preserve
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static void init(grib_accessor*, const long, grib_arguments*);
-static size_t preferred_size(grib_accessor*, int);
-
-typedef struct grib_accessor_section_padding
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in bytes */
-    /* Members defined in padding */
-    /* Members defined in section_padding */
-    int preserve;
-} grib_accessor_section_padding;
-
-extern grib_accessor_class* grib_accessor_class_padding;
-
-static grib_accessor_class _grib_accessor_class_section_padding = {
-    &grib_accessor_class_padding,                      /* super */
-    "section_padding",                      /* name */
-    sizeof(grib_accessor_section_padding),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    &preferred_size,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_section_padding = &_grib_accessor_class_section_padding;
-
-/* END_CLASS_IMP */
-
-static size_t preferred_size(grib_accessor* a, int from_handle)
-{
-    grib_accessor_section_padding* self = (grib_accessor_section_padding*)a;
-    grib_accessor* b                    = a;
-    grib_accessor* section_length       = 0;
-    long length                         = 0;
-    size_t size                         = 1;
-
-    long alength = 0;
-
-    if (!from_handle) {
-        if (self->preserve)
-            return a->length;
-        else
-            return 0;
-    }
-
-    /* The section length should be a parameter */
-    while (section_length == NULL && b != NULL) {
-        section_length = b->parent->aclength;
-        b              = b->parent->owner;
-    }
-
-    if (!section_length) {
-        /* printf("PADDING is no !section_length\n"); */
-        return 0;
-    }
-
-    if (grib_unpack_long(section_length, &length, &size) == GRIB_SUCCESS) {
-        if (length)
-            alength = length - a->offset + section_length->parent->owner->offset;
-        else
-            alength = 0;
-
-        /*Assert(a->length>=0);*/
-
-        if (alength < 0)
-            alength = 0;
-
-        /* printf("PADDING is %ld\n",a->length); */
-    }
-    else {
-        /* printf("PADDING unpack fails\n"); */
-    }
-
-    return alength;
-}
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    grib_accessor_section_padding* self = (grib_accessor_section_padding*)a;
-    self->preserve                      = 1; /* This should be a parameter */
-    a->length                           = preferred_size(a, 1);
-}
diff --git a/src/accessor/todo/grib_accessor_class_section_pointer.cc b/src/accessor/todo/grib_accessor_class_section_pointer.cc
deleted file mode 100644
index 861ab12e7..000000000
--- a/src/accessor/todo/grib_accessor_class_section_pointer.cc
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = init;get_native_type;unpack_string
-   IMPLEMENTS = byte_count; byte_offset
-   MEMBERS = const char* sectionOffset
-   MEMBERS = const char* sectionLength
-   MEMBERS = long sectionNumber
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static long byte_count(grib_accessor*);
-static long byte_offset(grib_accessor*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_section_pointer
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in section_pointer */
-    const char* sectionOffset;
-    const char* sectionLength;
-    long sectionNumber;
-} grib_accessor_section_pointer;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_section_pointer = {
-    &grib_accessor_class_gen,                      /* super */
-    "section_pointer",                      /* name */
-    sizeof(grib_accessor_section_pointer),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    &byte_count,                 /* get number of bytes */
-    &byte_offset,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_section_pointer = &_grib_accessor_class_section_pointer;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    int n = 0;
-    grib_accessor_section_pointer* self = (grib_accessor_section_pointer*)a;
-
-    self->sectionOffset = grib_arguments_get_name(grib_handle_of_accessor(a), arg, n++);
-    self->sectionLength = grib_arguments_get_name(grib_handle_of_accessor(a), arg, n++);
-    self->sectionNumber = grib_arguments_get_long(grib_handle_of_accessor(a), arg, n++);
-
-    Assert(self->sectionNumber < MAX_NUM_SECTIONS);
-
-    grib_handle_of_accessor(a)->section_offset[self->sectionNumber] = (char*)self->sectionOffset;
-    grib_handle_of_accessor(a)->section_length[self->sectionNumber] = (char*)self->sectionLength;
-
-    /* printf("++++++++++++++ GRIB_API:  creating section_pointer%d %s %s\n", */
-    /* self->sectionNumber,self->sectionLength,self->sectionLength); */
-
-    if (grib_handle_of_accessor(a)->sections_count < self->sectionNumber)
-        grib_handle_of_accessor(a)->sections_count = self->sectionNumber;
-
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->flags |= GRIB_ACCESSOR_FLAG_HIDDEN;
-    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
-    a->flags |= GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC;
-    a->length = 0;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_BYTES;
-}
-
-static int unpack_string(grib_accessor* a, char* v, size_t* len)
-{
-    /*
-      unsigned char* p=NULL;
-      char* s=v;
-      int i;
-      long length=grib_byte_count(a);
-
-      if (*len < length) return GRIB_ARRAY_TOO_SMALL;
-
-      p  = grib_handle_of_accessor(a)->buffer->data + grib_byte_offset(a);
-
-      for (i = 0; i < length; i++)  {
-        snprintf (s,64,"%02x", *(p++));
-        s+=2;
-      }
-      *len=length;
-    */
-    snprintf(v, 64, "%ld_%ld", grib_byte_offset(a), grib_byte_count(a));
-    return GRIB_SUCCESS;
-}
-
-static long byte_count(grib_accessor* a)
-{
-    grib_accessor_section_pointer* self = (grib_accessor_section_pointer*)a;
-    long sectionLength = 0;
-    int ret = 0;
-
-    ret = grib_get_long(grib_handle_of_accessor(a), self->sectionLength, &sectionLength);
-    if (ret) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "Unable to get %s %s",
-                         self->sectionLength, grib_get_error_message(ret));
-        return -1;
-    }
-
-    return sectionLength;
-}
-
-static long byte_offset(grib_accessor* a)
-{
-    grib_accessor_section_pointer* self = (grib_accessor_section_pointer*)a;
-    long sectionOffset = 0;
-    int ret = 0;
-
-    ret = grib_get_long(grib_handle_of_accessor(a), self->sectionOffset, &sectionOffset);
-    if (ret) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "Unable to get %s %s",
-                         self->sectionOffset, grib_get_error_message(ret));
-        return -1;
-    }
-
-    return sectionOffset;
-}
diff --git a/src/accessor/todo/grib_accessor_class_sexagesimal2decimal.cc b/src/accessor/todo/grib_accessor_class_sexagesimal2decimal.cc
deleted file mode 100644
index 9e132d9c2..000000000
--- a/src/accessor/todo/grib_accessor_class_sexagesimal2decimal.cc
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-/***********************************************************
- *  Enrico Fucile
- ***********************************************************/
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_to_double
-   IMPLEMENTS = init; unpack_string
-   IMPLEMENTS = dump
-   IMPLEMENTS = get_native_type
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_sexagesimal2decimal
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in to_double */
-    const char* key;
-    long start;
-    size_t length;
-    long scale;
-    /* Members defined in sexagesimal2decimal */
-} grib_accessor_sexagesimal2decimal;
-
-extern grib_accessor_class* grib_accessor_class_to_double;
-
-static grib_accessor_class _grib_accessor_class_sexagesimal2decimal = {
-    &grib_accessor_class_to_double,                      /* super */
-    "sexagesimal2decimal",                      /* name */
-    sizeof(grib_accessor_sexagesimal2decimal),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_sexagesimal2decimal = &_grib_accessor_class_sexagesimal2decimal;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    grib_dump_double(dumper, a, NULL);
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_DOUBLE;
-}
-
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    int err                                 = 0;
-    grib_accessor_sexagesimal2decimal* self = (grib_accessor_sexagesimal2decimal*)a;
-    char buff[512]                          = {0,};
-    size_t length = 0;
-    size_t size   = 512;
-    char* p;
-    char* q;
-    double dd, mm = 0, ss = 0;
-    int dd_sign = 1;
-
-    err = grib_get_string(grib_handle_of_accessor(a), self->key, buff, &size);
-    if (err)
-        return err;
-    q = buff + self->start;
-    if (self->length)
-        q[length] = 0;
-    p = q;
-
-    while (*p != '-' && *p != ':' && *p != ' ' && *p != 0) {
-        p++;
-    }
-
-    if (*p == 0) {
-        return GRIB_WRONG_CONVERSION;
-    }
-    *p = 0;
-
-    dd = atoi(q);
-    p++;
-    q = p;
-    while (*p != '-' && *p != ':' && *p != ' ' && *p != 'N' && *p != 'S' && *p != 'E' && *p != 'W' && *p != 0) {
-        p++;
-    }
-    switch (*p) {
-        case ' ':
-        case '-':
-        case ':':
-            *p = 0;
-            mm = atoi(q) / 60.0;
-            dd += mm;
-            p++;
-            q = p;
-            break;
-        case 'N':
-        case 'E':
-            *p      = 0;
-            dd_sign = 1;
-            mm      = atoi(q) / 60.0;
-            dd += mm;
-            p++;
-            q = p;
-            break;
-        case 'S':
-        case 'W':
-            *p = 0;
-            mm = atoi(q) / 60.0;
-            dd += mm;
-            dd_sign = -1;
-            p++;
-            q = p;
-            break;
-        case 0:
-            break;
-        default:
-            return GRIB_WRONG_CONVERSION;
-    }
-    if (*p) {
-        while (*p != '-' && *p != ':' && *p != ' ' && *p != 'N' && *p != 'S' && *p != 'E' && *p != 'W' && *p != 0) {
-            p++;
-        }
-        switch (*p) {
-            case ' ':
-            case '-':
-            case ':':
-                *p = 0;
-                ss = atof(q) / 60.0;
-                dd += ss;
-                break;
-            case 'N':
-            case 'E':
-                *p = 0;
-                ss = atof(q) / 60.0;
-                dd += ss;
-                dd_sign = 1;
-                break;
-            case 'S':
-            case 'W':
-                *p = 0;
-                ss = atof(q) / 60.0;
-                dd += ss;
-                dd_sign = -1;
-                break;
-            case 0:
-                break;
-            default:
-                return GRIB_WRONG_CONVERSION;
-        }
-    }
-    dd *= dd_sign;
-
-    snprintf(buff, sizeof(buff), "%.2f", dd);
-    length = strlen(buff);
-
-    if (len[0] < length + 1) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "unpack_string: Wrong size (%lu) for %s, it contains %ld values",
-                len[0], a->name, a->length + 1);
-        len[0] = 0;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    strcpy(val, buff);
-
-    len[0] = length;
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_signed_bits.cc b/src/accessor/todo/grib_accessor_class_signed_bits.cc
deleted file mode 100644
index dc8ccf488..000000000
--- a/src/accessor/todo/grib_accessor_class_signed_bits.cc
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long;pack_long
-   IMPLEMENTS = init
-   IMPLEMENTS = next_offset
-   IMPLEMENTS = byte_count
-   IMPLEMENTS = value_count
-   IMPLEMENTS = byte_offset
-   IMPLEMENTS = update_size
-   MEMBERS    = const char* numberOfBits
-   MEMBERS    = const char* numberOfElements
-
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static long byte_count(grib_accessor*);
-static long byte_offset(grib_accessor*);
-static long next_offset(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static void update_size(grib_accessor*, size_t);
-
-typedef struct grib_accessor_signed_bits
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in signed_bits */
-    const char* numberOfBits;
-    const char* numberOfElements;
-} grib_accessor_signed_bits;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_signed_bits = {
-    &grib_accessor_class_long,                      /* super */
-    "signed_bits",                      /* name */
-    sizeof(grib_accessor_signed_bits),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    &next_offset,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    &byte_count,                 /* get number of bytes */
-    &byte_offset,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    &update_size,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_signed_bits = &_grib_accessor_class_signed_bits;
-
-/* END_CLASS_IMP */
-
-static long byte_count(grib_accessor* a)
-{
-    return a->length;
-}
-
-static long compute_byte_count(grib_accessor* a)
-{
-    grib_accessor_signed_bits* self = (grib_accessor_signed_bits*)a;
-    long numberOfBits;
-    long numberOfElements;
-    int ret = 0;
-
-    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfBits, &numberOfBits);
-    if (ret) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "%s unable to get %s to compute size", a->name, self->numberOfBits);
-        return 0;
-    }
-
-    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfElements, &numberOfElements);
-    if (ret) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "%s unable to get %s to compute size", a->name, self->numberOfElements);
-        return 0;
-    }
-
-    return (numberOfBits * numberOfElements + 7) / 8;
-}
-
-static void init(grib_accessor* a, const long len, grib_arguments* args)
-{
-    grib_accessor_signed_bits* self = (grib_accessor_signed_bits*)a;
-    int n                           = 0;
-    self->numberOfBits              = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
-    self->numberOfElements          = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
-    a->length                       = compute_byte_count(a);
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    return GRIB_NOT_IMPLEMENTED;
-#if 0
-    grib_accessor_signed_bits* self = (grib_accessor_signed_bits*)a;
-    int i;
-    int ret           = 0;
-    long pos          = a->offset * 8;
-    long rlen         = 0;
-    long numberOfBits = 0;
-
-    ret = value_count(a, &rlen);
-    if (ret)
-        return ret;
-
-    if (*len < rlen) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "Wrong size (%ld) for %s it contains %ld values", *len, a->name, rlen);
-        *len = 0;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfBits, &numberOfBits);
-    if (ret)
-        return ret;
-
-    if (numberOfBits == 0) {
-        for (i = 0; i < rlen; i++)
-            val[i] = 0;
-        return GRIB_SUCCESS;
-    }
-
-    for (i = 0; i < rlen; i++)
-        val[i] = grib_decode_signed_longb(grib_handle_of_accessor(a)->buffer->data, &pos, numberOfBits);
-
-    *len = rlen;
-
-    return GRIB_SUCCESS;
-#endif
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    return GRIB_NOT_IMPLEMENTED;
-#if 0
-    grib_accessor_signed_bits* self = (grib_accessor_signed_bits*)a;
-    int ret                         = 0;
-    long off                        = 0;
-    long numberOfBits               = 0;
-    size_t buflen                   = 0;
-    unsigned char* buf              = NULL;
-    unsigned long i                 = 0;
-    unsigned long rlen              = 0;
-    long count                      = 0;
-
-    ret = value_count(a, &count);
-    if (ret)
-        return ret;
-    rlen = count;
-    if (*len != rlen) {
-        ret = grib_set_long(grib_handle_of_accessor(a), self->numberOfElements, rlen);
-        if (ret)
-            return ret;
-    }
-
-    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfBits, &numberOfBits);
-    if (ret)
-        return ret;
-
-    buflen = compute_byte_count(a);
-    buf    = (unsigned char*)grib_context_malloc_clear(a->context, buflen + sizeof(long));
-
-    for (i = 0; i < rlen; i++)
-        grib_encode_signed_longb(buf, val[i], &off, numberOfBits);
-
-    grib_buffer_replace(a, buf, buflen, 1, 1);
-
-    grib_context_free(a->context, buf);
-
-    return ret;
-#endif
-}
-
-static int value_count(grib_accessor* a, long* numberOfElements)
-{
-    grib_accessor_signed_bits* self = (grib_accessor_signed_bits*)a;
-    *numberOfElements               = 0;
-
-    return grib_get_long(grib_handle_of_accessor(a), self->numberOfElements, numberOfElements);
-}
-
-static long byte_offset(grib_accessor* a)
-{
-    return a->offset;
-}
-
-static void update_size(grib_accessor* a, size_t s)
-{
-    a->length = s;
-}
-
-static long next_offset(grib_accessor* a)
-{
-    return byte_offset(a) + byte_count(a);
-}
diff --git a/src/accessor/todo/grib_accessor_class_simple_packing_error.cc b/src/accessor/todo/grib_accessor_class_simple_packing_error.cc
deleted file mode 100644
index 64f96eeea..000000000
--- a/src/accessor/todo/grib_accessor_class_simple_packing_error.cc
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_scaling.h"
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_double
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = init
-   MEMBERS=const char*    binaryScaleFactor
-   MEMBERS=const char*    bitsPerValue
-   MEMBERS=const char*    decimalScaleFactor
-   MEMBERS=const char*    referenceValue
-   MEMBERS=const char*    floatType
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_simple_packing_error
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in simple_packing_error */
-    const char*    binaryScaleFactor;
-    const char*    bitsPerValue;
-    const char*    decimalScaleFactor;
-    const char*    referenceValue;
-    const char*    floatType;
-} grib_accessor_simple_packing_error;
-
-extern grib_accessor_class* grib_accessor_class_double;
-
-static grib_accessor_class _grib_accessor_class_simple_packing_error = {
-    &grib_accessor_class_double,                      /* super */
-    "simple_packing_error",                      /* name */
-    sizeof(grib_accessor_simple_packing_error),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_simple_packing_error = &_grib_accessor_class_simple_packing_error;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_simple_packing_error* self = (grib_accessor_simple_packing_error*)a;
-    int n = 0;
-    grib_handle* h = grib_handle_of_accessor(a);
-
-    self->bitsPerValue       = grib_arguments_get_name(h, c, n++);
-    self->binaryScaleFactor  = grib_arguments_get_name(h, c, n++);
-    self->decimalScaleFactor = grib_arguments_get_name(h, c, n++);
-    self->referenceValue     = grib_arguments_get_name(h, c, n++);
-    self->floatType          = grib_arguments_get_name(h, c, n++);
-
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->length = 0;
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_simple_packing_error* self = (grib_accessor_simple_packing_error*)a;
-
-    int ret                 = 0;
-    long binaryScaleFactor  = 0;
-    long bitsPerValue       = 0;
-    long decimalScaleFactor = 0;
-    double referenceValue   = 0;
-    grib_handle* h = grib_handle_of_accessor(a);
-
-    if ((ret = grib_get_long_internal(h, self->binaryScaleFactor, &binaryScaleFactor)) != GRIB_SUCCESS)
-        return ret;
-    if ((ret = grib_get_long_internal(h, self->bitsPerValue, &bitsPerValue)) != GRIB_SUCCESS)
-        return ret;
-
-    if ((ret = grib_get_long_internal(h, self->decimalScaleFactor, &decimalScaleFactor)) != GRIB_SUCCESS)
-        return ret;
-
-    if ((ret = grib_get_double_internal(h, self->referenceValue, &referenceValue)) != GRIB_SUCCESS)
-        return ret;
-
-    if (!strcmp(self->floatType, "ibm"))
-        *val = grib_ibmfloat_error(referenceValue);
-    else if (!strcmp(self->floatType, "ieee"))
-        *val = grib_ieeefloat_error(referenceValue);
-    else
-        Assert(1 == 0);
-
-    if (bitsPerValue != 0)
-        *val = (*val + codes_power<double>(binaryScaleFactor, 2)) * codes_power<double>(-decimalScaleFactor, 10) * 0.5;
-
-    if (ret == GRIB_SUCCESS)
-        *len = 1;
-
-    return ret;
-}
diff --git a/src/accessor/todo/grib_accessor_class_size.cc b/src/accessor/todo/grib_accessor_class_size.cc
deleted file mode 100644
index 410cec3c3..000000000
--- a/src/accessor/todo/grib_accessor_class_size.cc
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = init
-   MEMBERS = const char* accessor
-   END_CLASS_DEF
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_size
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in size */
-    const char* accessor;
-} grib_accessor_size;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_size = {
-    &grib_accessor_class_long,                      /* super */
-    "size",                      /* name */
-    sizeof(grib_accessor_size),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_size = &_grib_accessor_class_size;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_size* self = (grib_accessor_size*)a;
-    self->accessor           = grib_arguments_get_name(grib_handle_of_accessor(a), c, 0);
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
-    a->length = 0;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    int ret                  = 0;
-    size_t size              = 0;
-    grib_accessor_size* self = (grib_accessor_size*)a;
-    ret                      = grib_get_size(grib_handle_of_accessor(a), self->accessor, &size);
-    *val                     = (long)size;
-    *len                     = 1;
-    return ret;
-}
diff --git a/src/accessor/todo/grib_accessor_class_smart_table_column.cc b/src/accessor/todo/grib_accessor_class_smart_table_column.cc
deleted file mode 100644
index 295f29281..000000000
--- a/src/accessor/todo/grib_accessor_class_smart_table_column.cc
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = init;dump;unpack_string_array;unpack_long
-   IMPLEMENTS = value_count; destroy; get_native_type;
-   MEMBERS    =  const char* smartTable
-   MEMBERS    =  int index
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string_array(grib_accessor*, char**, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void destroy(grib_context*, grib_accessor*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_smart_table_column
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in smart_table_column */
-    const char* smartTable;
-    int index;
-} grib_accessor_smart_table_column;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_smart_table_column = {
-    &grib_accessor_class_gen,                      /* super */
-    "smart_table_column",                      /* name */
-    sizeof(grib_accessor_smart_table_column),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    &destroy,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    &unpack_string_array,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_smart_table_column = &_grib_accessor_class_smart_table_column;
-
-/* END_CLASS_IMP */
-
-typedef struct grib_accessor_smart_table
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in unsigned */
-    long nbytes;
-    grib_arguments* arg;
-    /* Members defined in smart_table */
-    const char* values;
-    const char* tablename;
-    const char* masterDir;
-    const char* localDir;
-    const char* extraDir;
-    const char* extraTable;
-    int widthOfCode;
-    long* tableCodes;
-    size_t tableCodesSize;
-    grib_smart_table* table;
-    int dirty;
-} grib_accessor_smart_table;
-
-static void init(grib_accessor* a, const long len, grib_arguments* params)
-{
-    int n = 0;
-    grib_accessor_smart_table_column* self = (grib_accessor_smart_table_column*)a;
-
-    self->smartTable = grib_arguments_get_name(grib_handle_of_accessor(a), params, n++);
-    self->index = grib_arguments_get_long(grib_handle_of_accessor(a), params, n++);
-
-    a->length = 0;
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    int type = get_native_type(a);
-
-    switch (type) {
-        case GRIB_TYPE_LONG:
-            grib_dump_long(dumper, a, NULL);
-            break;
-        case GRIB_TYPE_STRING:
-            grib_dump_string_array(dumper, a, NULL);
-            break;
-    }
-}
-
-static int unpack_string_array(grib_accessor* a, char** buffer, size_t* len)
-{
-    grib_accessor_smart_table_column* self   = (grib_accessor_smart_table_column*)a;
-    grib_accessor_smart_table* tableAccessor = NULL;
-    grib_smart_table* table = NULL;
-
-    size_t size = 1;
-    long* code;
-    int err = GRIB_SUCCESS;
-    char tmp[1024] = {0,};
-    int i = 0;
-
-    tableAccessor = (grib_accessor_smart_table*)grib_find_accessor(grib_handle_of_accessor(a), self->smartTable);
-    if (!tableAccessor) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "Unable to find accessor %s", self->smartTable);
-        return GRIB_NOT_FOUND;
-    }
-
-    err = grib_get_size_acc(grib_handle_of_accessor(a), (grib_accessor*)tableAccessor, &size);
-    if (err)
-        return err;
-    if (*len < size) {
-        return GRIB_BUFFER_TOO_SMALL;
-    }
-
-    code = (long*)grib_context_malloc_clear(a->context, sizeof(long) * size);
-    if (!code) {
-        grib_context_log(a->context, GRIB_LOG_FATAL, "%s: Memory allocation error: %zu bytes", a->name, size);
-        return GRIB_OUT_OF_MEMORY;
-    }
-
-    if ((err = grib_unpack_long((grib_accessor*)tableAccessor, code, &size)) != GRIB_SUCCESS)
-        return err;
-
-    table = tableAccessor->table;
-
-    for (i = 0; i < size; i++) {
-        if (table && (code[i] >= 0) &&
-            (code[i] < table->numberOfEntries) &&
-            table->entries[code[i]].column[self->index]) {
-            strcpy(tmp, table->entries[code[i]].column[self->index]);
-        }
-        else {
-            snprintf(tmp, sizeof(tmp), "%d", (int)code[i]);
-        }
-
-        buffer[i] = grib_context_strdup(a->context, tmp);
-    }
-    *len = size;
-    grib_context_free(a->context, code);
-
-    return GRIB_SUCCESS;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_smart_table_column* self   = (grib_accessor_smart_table_column*)a;
-    grib_accessor_smart_table* tableAccessor = NULL;
-    grib_smart_table* table = NULL;
-
-    size_t size = 1;
-    long* code;
-    int err = GRIB_SUCCESS;
-    int i   = 0;
-
-    for (i = 0; i < *len; i++)
-        val[i] = GRIB_MISSING_LONG;
-
-    tableAccessor = (grib_accessor_smart_table*)grib_find_accessor(grib_handle_of_accessor(a), self->smartTable);
-    if (!tableAccessor) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "Unable to find accessor %s", self->smartTable);
-        return GRIB_NOT_FOUND;
-    }
-
-    err = grib_get_size_acc(grib_handle_of_accessor(a), (grib_accessor*)tableAccessor, &size);
-    if (err)
-        return err;
-    if (*len < size) {
-        return GRIB_BUFFER_TOO_SMALL;
-    }
-
-    code = (long*)grib_context_malloc_clear(a->context, sizeof(long) * size);
-    if (!code) return GRIB_OUT_OF_MEMORY;
-
-    if ((err = grib_unpack_long((grib_accessor*)tableAccessor, code, &size)) != GRIB_SUCCESS) {
-        grib_context_free(a->context, code);
-        return err;
-    }
-
-    table = tableAccessor->table;
-
-    for (i = 0; i < size; i++) {
-        if (table && (code[i] >= 0) &&
-            (code[i] < table->numberOfEntries) &&
-            table->entries[code[i]].column[self->index]) {
-            val[i] = atol(table->entries[code[i]].column[self->index]);
-        }
-    }
-    *len = size;
-    grib_context_free(a->context, code);
-
-    return GRIB_SUCCESS;
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    grib_accessor_smart_table_column* self = (grib_accessor_smart_table_column*)a;
-    size_t size = 0;
-    int err = 0;
-    *count = 0;
-
-    if (!self->smartTable)
-        return 0;
-
-    err = grib_get_size(grib_handle_of_accessor(a), self->smartTable, &size);
-    *count = size;
-    return err;
-}
-
-static void destroy(grib_context* context, grib_accessor* a)
-{
-    if (a->vvalue != NULL) {
-        grib_context_free(context, a->vvalue);
-        a->vvalue = NULL;
-    }
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    int type = GRIB_TYPE_LONG;
-    /*printf("---------- %s flags=%ld GRIB_ACCESSOR_FLAG_STRING_TYPE=%d\n",
-         a->name,a->flags,GRIB_ACCESSOR_FLAG_STRING_TYPE);*/
-    if (a->flags & GRIB_ACCESSOR_FLAG_STRING_TYPE)
-        type = GRIB_TYPE_STRING;
-    return type;
-}
diff --git a/src/accessor/todo/grib_accessor_class_spd.cc b/src/accessor/todo/grib_accessor_class_spd.cc
deleted file mode 100644
index e0f4a20a7..000000000
--- a/src/accessor/todo/grib_accessor_class_spd.cc
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long;pack_long
-   IMPLEMENTS = init
-   IMPLEMENTS = next_offset
-   IMPLEMENTS = byte_count
-   IMPLEMENTS = value_count
-   IMPLEMENTS = byte_offset
-   IMPLEMENTS = update_size
-   MEMBERS    = const char* numberOfBits
-   MEMBERS    = const char* numberOfElements
-
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static long byte_count(grib_accessor*);
-static long byte_offset(grib_accessor*);
-static long next_offset(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static void update_size(grib_accessor*, size_t);
-
-typedef struct grib_accessor_spd
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in spd */
-    const char* numberOfBits;
-    const char* numberOfElements;
-} grib_accessor_spd;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_spd = {
-    &grib_accessor_class_long,                      /* super */
-    "spd",                      /* name */
-    sizeof(grib_accessor_spd),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    &next_offset,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    &byte_count,                 /* get number of bytes */
-    &byte_offset,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    &update_size,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_spd = &_grib_accessor_class_spd;
-
-/* END_CLASS_IMP */
-
-static long byte_count(grib_accessor* a)
-{
-    return a->length;
-}
-
-static long compute_byte_count(grib_accessor* a)
-{
-    grib_accessor_spd* self = (grib_accessor_spd*)a;
-    long numberOfBits;
-    long numberOfElements;
-    int ret = 0;
-
-    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfBits, &numberOfBits);
-    if (ret) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "%s unable to get %s to compute size", a->name, self->numberOfBits);
-        return 0;
-    }
-
-    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfElements, &numberOfElements);
-    if (ret) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "%s unable to get %s to compute size", a->name, self->numberOfElements);
-        return 0;
-    }
-    numberOfElements++;
-
-    return (numberOfBits * numberOfElements + 7) / 8;
-}
-
-static void init(grib_accessor* a, const long len, grib_arguments* args)
-{
-    grib_accessor_spd* self = (grib_accessor_spd*)a;
-    int n                   = 0;
-    self->numberOfBits      = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
-    self->numberOfElements  = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
-    a->length               = compute_byte_count(a);
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_spd* self = (grib_accessor_spd*)a;
-    int i;
-    int ret           = 0;
-    long pos          = a->offset * 8;
-    long rlen         = 0;
-    long numberOfBits = 0;
-
-    ret = value_count(a, &rlen);
-    if (ret)
-        return ret;
-
-    if (*len < rlen) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "Wrong size (%zu) for %s, it contains %ld values", *len, a->name, rlen);
-        *len = rlen;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfBits, &numberOfBits);
-    if (ret)
-        return ret;
-    if (numberOfBits > 64) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,"Invalid number of bits: %ld",numberOfBits);
-        return GRIB_DECODING_ERROR;
-    }
-
-    for (i = 0; i < rlen - 1; i++)
-        val[i] = grib_decode_unsigned_long(grib_handle_of_accessor(a)->buffer->data, &pos, numberOfBits);
-
-    val[rlen - 1] = grib_decode_signed_longb(grib_handle_of_accessor(a)->buffer->data, &pos, numberOfBits);
-
-    *len = rlen;
-
-    return GRIB_SUCCESS;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_spd* self = (grib_accessor_spd*)a;
-    int ret                 = 0;
-    long off                = 0;
-    long numberOfBits       = 0;
-    size_t buflen           = 0;
-    unsigned char* buf      = NULL;
-    unsigned long i         = 0;
-    long rlen               = 0;
-
-    ret = value_count(a, &rlen);
-    if (ret)
-        return ret;
-
-    if (*len != rlen) {
-        ret = grib_set_long(grib_handle_of_accessor(a), self->numberOfElements, (*len) - 1);
-        if (ret) return ret;
-    }
-
-    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfBits, &numberOfBits);
-    if (ret)
-        return ret;
-
-    buflen = compute_byte_count(a);
-    buf    = (unsigned char*)grib_context_malloc_clear(a->context, buflen);
-
-    for (i = 0; i < rlen - 1; i++) {
-        grib_encode_unsigned_longb(buf, val[i], &off, numberOfBits);
-    }
-
-    grib_encode_signed_longb(buf, val[rlen - 1], &off, numberOfBits);
-
-    grib_buffer_replace(a, buf, buflen, 1, 1);
-
-    grib_context_free(a->context, buf);
-
-    *len = rlen;
-    return ret;
-}
-
-static int value_count(grib_accessor* a, long* numberOfElements)
-{
-    grib_accessor_spd* self = (grib_accessor_spd*)a;
-    int ret;
-    *numberOfElements = 0;
-
-    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfElements, numberOfElements);
-    if (ret) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "%s unable to get %s to compute size", a->name, self->numberOfElements);
-        return ret;
-    }
-    (*numberOfElements)++;
-
-    return ret;
-}
-
-static long byte_offset(grib_accessor* a)
-{
-    return a->offset;
-}
-
-static void update_size(grib_accessor* a, size_t s)
-{
-    a->length = s;
-}
-
-static long next_offset(grib_accessor* a)
-{
-    return byte_offset(a) + a->length;
-}
diff --git a/src/accessor/todo/grib_accessor_class_spectral_truncation.cc b/src/accessor/todo/grib_accessor_class_spectral_truncation.cc
deleted file mode 100644
index 6cc902fa7..000000000
--- a/src/accessor/todo/grib_accessor_class_spectral_truncation.cc
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/**************************************
- *  Enrico Fucile
- **************************************/
-
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = init
-   MEMBERS=const char* J
-   MEMBERS=const char* K
-   MEMBERS=const char* M
-   MEMBERS=const char* T
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_spectral_truncation
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in spectral_truncation */
-    const char* J;
-    const char* K;
-    const char* M;
-    const char* T;
-} grib_accessor_spectral_truncation;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_spectral_truncation = {
-    &grib_accessor_class_long,                      /* super */
-    "spectral_truncation",                      /* name */
-    sizeof(grib_accessor_spectral_truncation),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_spectral_truncation = &_grib_accessor_class_spectral_truncation;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_spectral_truncation* self = (grib_accessor_spectral_truncation*)a;
-    int n                                   = 0;
-
-    self->J = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->K = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->M = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->T = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_spectral_truncation* self = (grib_accessor_spectral_truncation*)a;
-    int ret                                 = 0;
-
-    long J, K, M, T, Tc;
-
-    if (*len < 1)
-        return GRIB_ARRAY_TOO_SMALL;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->J, &J)) != GRIB_SUCCESS)
-        return ret;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->K, &K)) != GRIB_SUCCESS)
-        return ret;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->M, &M)) != GRIB_SUCCESS)
-        return ret;
-
-    Tc = -1;
-    if (J == K && K == M) {
-        /* Triangular truncation */
-        Tc = (M + 1) * (M + 2);
-    }
-    if (K == J + M) {
-        /* Rhomboidal truncation */
-        Tc = 2 * J * M;
-    }
-    if (J == K && K > M) {
-        /* Trapezoidal truncation */
-        Tc = M * (2 * J - M);
-    }
-    *val = Tc;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->T, &T)) != GRIB_SUCCESS) {
-        if (Tc == -1)
-            grib_context_log(a->context, GRIB_LOG_ERROR,
-                             "%s. Spectral Truncation Type Unknown: %s=%ld %s=%ld %s=%ld",
-                             a->name, self->J, J, self->K, K, self->M, M);
-        Tc = 0;
-        grib_set_long(grib_handle_of_accessor(a), self->T, Tc);
-    }
-    else {
-        if (Tc != -1 && Tc != T)
-            grib_set_long(grib_handle_of_accessor(a), self->T, Tc);
-    }
-
-    if (ret == GRIB_SUCCESS)
-        *len = 1;
-
-    return ret;
-}
diff --git a/src/accessor/todo/grib_accessor_class_statistics_spectral.cc b/src/accessor/todo/grib_accessor_class_statistics_spectral.cc
deleted file mode 100644
index 435582bef..000000000
--- a/src/accessor/todo/grib_accessor_class_statistics_spectral.cc
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/**************************************
- *  Enrico Fucile
- **************************************/
-
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_abstract_vector
-   IMPLEMENTS = unpack_double; destroy
-   IMPLEMENTS = value_count;compare
-   IMPLEMENTS = init
-   MEMBERS = const char* values
-   MEMBERS = const char* J
-   MEMBERS = const char* K
-   MEMBERS = const char* M
-   MEMBERS = const char* JS
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void destroy(grib_context*, grib_accessor*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static int compare(grib_accessor*, grib_accessor*);
-
-typedef struct grib_accessor_statistics_spectral
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in abstract_vector */
-    double* v;
-    int number_of_elements;
-    /* Members defined in statistics_spectral */
-    const char* values;
-    const char* J;
-    const char* K;
-    const char* M;
-    const char* JS;
-} grib_accessor_statistics_spectral;
-
-extern grib_accessor_class* grib_accessor_class_abstract_vector;
-
-static grib_accessor_class _grib_accessor_class_statistics_spectral = {
-    &grib_accessor_class_abstract_vector,                      /* super */
-    "statistics_spectral",                      /* name */
-    sizeof(grib_accessor_statistics_spectral),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    &destroy,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    &compare,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_statistics_spectral = &_grib_accessor_class_statistics_spectral;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_statistics_spectral* self = (grib_accessor_statistics_spectral*)a;
-    int n                                   = 0;
-
-    self->values = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->J      = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->K      = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->M      = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->JS     = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
-
-    self->number_of_elements = 4;
-    self->v                  = (double*)grib_context_malloc(a->context,
-                                           sizeof(double) * self->number_of_elements);
-
-    a->length = 0;
-    a->dirty  = 1;
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_statistics_spectral* self = (grib_accessor_statistics_spectral*)a;
-    int ret = 0, i = 0;
-    double* values;
-    size_t size = 0;
-    long J, K, M, N;
-    double avg, enorm, sd;
-    grib_context* c = a->context;
-    grib_handle* h  = grib_handle_of_accessor(a);
-
-    if (!a->dirty)
-        return GRIB_SUCCESS;
-
-    if (*len != self->number_of_elements)
-        return GRIB_ARRAY_TOO_SMALL;
-
-    if ((ret = grib_get_size(h, self->values, &size)) != GRIB_SUCCESS)
-        return ret;
-
-    if ((ret = grib_get_long(grib_handle_of_accessor(a), self->J, &J)) != GRIB_SUCCESS)
-        return ret;
-
-    if ((ret = grib_get_long(grib_handle_of_accessor(a), self->K, &K)) != GRIB_SUCCESS)
-        return ret;
-
-    if ((ret = grib_get_long(grib_handle_of_accessor(a), self->M, &M)) != GRIB_SUCCESS)
-        return ret;
-
-    if (J != M || M != K)
-        return GRIB_NOT_IMPLEMENTED;
-
-    N = (M + 1) * (M + 2) / 2;
-
-    if (2 * N != size) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "wrong number of components for spherical harmonics %ld != %ld", 2 * N, size);
-        return GRIB_WRONG_ARRAY_SIZE;
-    }
-
-    values = (double*)grib_context_malloc(c, size * sizeof(double));
-    if (!values)
-        return GRIB_OUT_OF_MEMORY;
-
-    if ((ret = grib_get_double_array_internal(h, self->values, values, &size)) != GRIB_SUCCESS) {
-        grib_context_free(c, values);
-        return ret;
-    }
-
-    avg   = values[0];
-    sd    = 0;
-
-    for (i = 2; i < 2 * J; i += 2)
-        sd += values[i] * values[i];
-
-    for (i = 2 * J; i < size; i += 2)
-        sd += 2 * values[i] * values[i] + 2 * values[i + 1] * values[i + 1];
-
-    enorm = sd + avg * avg;
-
-    sd    = sqrt(sd);
-    enorm = sqrt(enorm);
-
-    a->dirty = 0;
-
-    grib_context_free(c, values);
-
-    self->v[0] = avg;
-    self->v[1] = enorm;
-    self->v[2] = sd;
-    self->v[3] = sd == 0 ? 1 : 0;
-
-    for (i = 0; i < self->number_of_elements; i++)
-        val[i] = self->v[i];
-
-    return ret;
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    grib_accessor_statistics_spectral* self = (grib_accessor_statistics_spectral*)a;
-    *count                                  = self->number_of_elements;
-    return 0;
-}
-
-static void destroy(grib_context* c, grib_accessor* a)
-{
-    grib_accessor_statistics_spectral* self = (grib_accessor_statistics_spectral*)a;
-    grib_context_free(c, self->v);
-}
-
-static int compare(grib_accessor* a, grib_accessor* b)
-{
-    int retval   = GRIB_SUCCESS;
-    double* aval = 0;
-    double* bval = 0;
-
-    size_t alen = 0;
-    size_t blen = 0;
-    int err     = 0;
-    long count  = 0;
-
-    err = grib_value_count(a, &count);
-    if (err)
-        return err;
-    alen = count;
-
-    err = grib_value_count(b, &count);
-    if (err)
-        return err;
-    blen = count;
-
-    if (alen != blen)
-        return GRIB_COUNT_MISMATCH;
-
-    aval = (double*)grib_context_malloc(a->context, alen * sizeof(double));
-    bval = (double*)grib_context_malloc(b->context, blen * sizeof(double));
-
-    b->dirty = 1;
-    a->dirty = 1;
-
-    grib_unpack_double(a, aval, &alen);
-    grib_unpack_double(b, bval, &blen);
-
-    retval = GRIB_SUCCESS;
-    for (size_t i=0; i<alen && retval == GRIB_SUCCESS; ++i) {
-        if (aval[i] != bval[i]) retval = GRIB_DOUBLE_VALUE_MISMATCH;
-    }
-
-    grib_context_free(a->context, aval);
-    grib_context_free(b->context, bval);
-
-    return retval;
-}
diff --git a/src/accessor/todo/grib_accessor_class_step_human_readable.cc b/src/accessor/todo/grib_accessor_class_step_human_readable.cc
deleted file mode 100644
index 557a58185..000000000
--- a/src/accessor/todo/grib_accessor_class_step_human_readable.cc
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-#include "step.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = init;unpack_string; get_native_type
-   MEMBERS    = const char* stepUnits
-   MEMBERS    = const char* step
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_step_human_readable
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in step_human_readable */
-    const char* stepUnits;
-    const char* step;
-} grib_accessor_step_human_readable;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_step_human_readable = {
-    &grib_accessor_class_gen,                      /* super */
-    "step_human_readable",                      /* name */
-    sizeof(grib_accessor_step_human_readable),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_step_human_readable = &_grib_accessor_class_step_human_readable;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* params)
-{
-    grib_accessor_step_human_readable* self = (grib_accessor_step_human_readable*)a;
-    int n                              = 0;
-    grib_handle* h = grib_handle_of_accessor(a);
-
-    self->stepUnits                    = grib_arguments_get_name(h, params, n++);
-    self->step                         = grib_arguments_get_name(h, params, n++);
-    a->length                          = 0;
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_STRING;
-}
-
-static int get_step_human_readable(grib_handle* h, char* result, size_t* length)
-{
-    int err = 0;
-    size_t slen = 2;
-    long step, hour, minute, second;
-
-    /* Change units to seconds (highest resolution)
-     * before computing the step value
-     */
-    if ((err = grib_set_string(h, "stepUnits", "s", &slen)) != GRIB_SUCCESS)
-        return err;
-    if ((err = grib_get_long(h, "step", &step)) != GRIB_SUCCESS) 
-        return err;
-
-    hour = step/3600;
-    minute = step/60 % 60;
-    second = step % 60;
-    /* sprintf(result, "%ld:%ld:%ld", hour, minute, second); */
-
-    if (second) {
-        snprintf(result, 1024, "%ldh %ldm %lds", hour, minute, second);
-    } else {
-        if (minute) snprintf(result, 1024, "%ldh %ldm", hour, minute);
-        else snprintf(result, 1024, "%ldh", hour);
-    }
-
-    *length = strlen(result);
-    return GRIB_SUCCESS;
-}
-
-static int unpack_string(grib_accessor* a, char* buffer, size_t* len)
-{
-    grib_accessor_step_human_readable* self = (grib_accessor_step_human_readable*)a;
-    grib_handle* h = grib_handle_of_accessor(a);
-    long stepUnits;
-    int err = 0;
-
-    /* Save the current value of stepUnits */
-    err = grib_get_long_internal(h, self->stepUnits, &stepUnits);
-    if (err) return err;
-
-    /* This will change stepUnits to seconds for its calculation */
-    err = get_step_human_readable(h, buffer, len);
-
-    /* Restore stepUnits */
-    grib_set_long(h, self->stepUnits, stepUnits);
-    return err;
-}
diff --git a/src/accessor/todo/grib_accessor_class_sum.cc b/src/accessor/todo/grib_accessor_class_sum.cc
deleted file mode 100644
index 4d964fc0c..000000000
--- a/src/accessor/todo/grib_accessor_class_sum.cc
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/**************************************
- *  Enrico Fucile
- **************************************/
-
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_double
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = value_count
-   IMPLEMENTS = init
-   MEMBERS=const char*    values
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_sum
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in sum */
-    const char*    values;
-} grib_accessor_sum;
-
-extern grib_accessor_class* grib_accessor_class_double;
-
-static grib_accessor_class _grib_accessor_class_sum = {
-    &grib_accessor_class_double,                      /* super */
-    "sum",                      /* name */
-    sizeof(grib_accessor_sum),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_sum = &_grib_accessor_class_sum;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_sum* self = (grib_accessor_sum*)a;
-    int n                   = 0;
-    self->values            = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    a->length               = 0;
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_sum* self = (grib_accessor_sum*)a;
-    int ret                 = 0;
-    size_t size             = 0;
-    long* values            = 0;
-    long i;
-    long count = 0;
-
-    ret = value_count(a, &count);
-    if (ret)
-        return ret;
-    size = count;
-
-    if (size == 0) {
-        *val = 0;
-        return GRIB_SUCCESS;
-    }
-    values = (long*)grib_context_malloc_clear(a->context, sizeof(long) * size);
-    if (!values)
-        return GRIB_OUT_OF_MEMORY;
-
-    grib_get_long_array(grib_handle_of_accessor(a), self->values, values, &size);
-
-    *val = 0;
-    for (i = 0; i < size; i++)
-        *val += values[i];
-
-    grib_context_free(a->context, values);
-
-    return GRIB_SUCCESS;
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_sum* self = (grib_accessor_sum*)a;
-    int ret                 = 0;
-    size_t size             = 0;
-    double* values          = 0;
-    long i;
-    long count = 0;
-
-    ret = value_count(a, &count);
-    if (ret)
-        return ret;
-    size = count;
-
-    if (size == 0) {
-        *val = 0;
-        return GRIB_SUCCESS;
-    }
-    values = (double*)grib_context_malloc_clear(a->context, sizeof(double) * size);
-    if (!values)
-        return GRIB_OUT_OF_MEMORY;
-
-    ret = grib_get_double_array(grib_handle_of_accessor(a), self->values, values, &size);
-    if (ret) {
-        grib_context_free(a->context, values);
-        return ret;
-    }
-    *val = 0;
-    for (i = 0; i < size; i++)
-        *val += values[i];
-
-    grib_context_free(a->context, values);
-
-    return GRIB_SUCCESS;
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    grib_accessor_sum* self = (grib_accessor_sum*)a;
-    size_t n                = 0;
-    int ret                 = 0;
-
-    ret    = grib_get_size(grib_handle_of_accessor(a), self->values, &n);
-    *count = n;
-
-    if (ret)
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "%s is unable to get size of %s", a->name, self->values);
-
-    return ret;
-}
diff --git a/src/accessor/todo/grib_accessor_class_suppressed.cc b/src/accessor/todo/grib_accessor_class_suppressed.cc
deleted file mode 100644
index a95269c5d..000000000
--- a/src/accessor/todo/grib_accessor_class_suppressed.cc
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = value_count;get_native_type
-   IMPLEMENTS = unpack_string
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = init
-   MEMBERS= grib_arguments* args
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_suppressed
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in suppressed */
-    grib_arguments* args;
-} grib_accessor_suppressed;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_suppressed = {
-    &grib_accessor_class_long,                      /* super */
-    "suppressed",                      /* name */
-    sizeof(grib_accessor_suppressed),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_suppressed = &_grib_accessor_class_suppressed;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_suppressed* self = (grib_accessor_suppressed*)a;
-    self->args                     = c;
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
-    a->length = 0;
-}
-
-static void log_message(grib_accessor* a)
-{
-    grib_accessor_suppressed* self = (grib_accessor_suppressed*)a;
-    int i                          = 0;
-    grib_handle* hand              = grib_handle_of_accessor(a);
-
-    grib_context_log(a->context, GRIB_LOG_ERROR,
-                     "key '%s' is unavailable in this version.", a->name);
-    grib_context_log(a->context, GRIB_LOG_ERROR,
-                     "Please use the following key(s):");
-    while (grib_arguments_get_name(hand, self->args, i)) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "\t- %s",
-                         grib_arguments_get_name(hand, self->args, i));
-        i++;
-    }
-}
-
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    log_message(a);
-    return GRIB_NOT_FOUND;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    log_message(a);
-    return GRIB_NOT_FOUND;
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    log_message(a);
-    return GRIB_NOT_FOUND;
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    *count = 1;
-    return 0;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_STRING;
-}
diff --git a/src/accessor/todo/grib_accessor_class_time.cc b/src/accessor/todo/grib_accessor_class_time.cc
deleted file mode 100644
index 3251fdd33..000000000
--- a/src/accessor/todo/grib_accessor_class_time.cc
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long;pack_long
-   IMPLEMENTS = unpack_string
-   IMPLEMENTS = init
-   MEMBERS=const char* hour
-   MEMBERS=const char* minute
-   MEMBERS=const char* second
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_time
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in time */
-    const char* hour;
-    const char* minute;
-    const char* second;
-} grib_accessor_time;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_time = {
-    &grib_accessor_class_long,                      /* super */
-    "time",                      /* name */
-    sizeof(grib_accessor_time),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_time = &_grib_accessor_class_time;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_time* self = (grib_accessor_time*)a;
-    grib_handle* hand        = grib_handle_of_accessor(a);
-    int n                    = 0;
-
-    self->hour   = grib_arguments_get_name(hand, c, n++);
-    self->minute = grib_arguments_get_name(hand, c, n++);
-    self->second = grib_arguments_get_name(hand, c, n++);
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    const grib_accessor_time* self = (grib_accessor_time*)a;
-
-    int ret = 0;
-    long hour = 0, minute = 0, second = 0;
-    grib_handle* hand = grib_handle_of_accessor(a);
-
-    if ((ret = grib_get_long_internal(hand, self->hour, &hour)) != GRIB_SUCCESS)
-        return ret;
-    if ((ret = grib_get_long_internal(hand, self->minute, &minute)) != GRIB_SUCCESS)
-        return ret;
-    if ((ret = grib_get_long_internal(hand, self->second, &second)) != GRIB_SUCCESS)
-        return ret;
-
-    /* We ignore the 'seconds' in our time calculation! */
-    if (second != 0) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                "Key %s (%s): Truncating time: non-zero seconds(%ld) ignored", a->name, __func__, second);
-    }
-
-    if (*len < 1)
-        return GRIB_WRONG_ARRAY_SIZE;
-
-    *val = hour * 100 + minute;
-
-    if (hour == 255) {
-        *val = 12 * 100;
-    }
-    if (hour != 255 && minute == 255) {
-        *val = hour * 100;
-    }
-    return GRIB_SUCCESS;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    const grib_accessor_time* self = (grib_accessor_time*)a;
-
-    int ret = 0;
-    long v = val[0];
-    grib_handle* hand = grib_handle_of_accessor(a);
-    long hour = 0, minute = 0, second = 0;
-
-    if (*len != 1)
-        return GRIB_WRONG_ARRAY_SIZE;
-
-    if (!is_time_valid(v)) {
-        // ECC-1777: For now just a warning. Will later change to an error
-        fprintf(stderr, "ECCODES WARNING :  %s:%s: Time is not valid! hour=%ld min=%ld sec=%ld\n",
-                a->cclass->name, __func__, hour, minute, second);
-        // return GRIB_ENCODING_ERROR;
-    }
-
-    hour   = v / 100;
-    minute = v % 100;
-    second = 0; /* We ignore the 'seconds' in our time calculation! */
-
-    if ((ret = grib_set_long_internal(hand, self->hour, hour)) != GRIB_SUCCESS)
-        return ret;
-    if ((ret = grib_set_long_internal(hand, self->minute, minute)) != GRIB_SUCCESS)
-        return ret;
-    if ((ret = grib_set_long_internal(hand, self->second, second)) != GRIB_SUCCESS)
-        return ret;
-
-    return GRIB_SUCCESS;
-}
-
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    long v = 0;
-    size_t lsize = 1, lmin = 5;
-
-    unpack_long(a, &v, &lsize);
-
-    if (*len < lmin) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
-                         a->cclass->name, a->name, lmin, *len);
-        *len = lmin;
-        return GRIB_BUFFER_TOO_SMALL;
-    }
-
-    snprintf(val, 64, "%04ld", v);
-
-    len[0] = lmin;
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_to_double.cc b/src/accessor/todo/grib_accessor_class_to_double.cc
deleted file mode 100644
index 69b06add9..000000000
--- a/src/accessor/todo/grib_accessor_class_to_double.cc
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = unpack_string
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = init;dump;string_length
-   IMPLEMENTS = value_count
-   IMPLEMENTS = next_offset
-   IMPLEMENTS = get_native_type
-   MEMBERS = const char* key
-   MEMBERS = long start
-   MEMBERS = size_t length
-   MEMBERS = long scale
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static size_t string_length(grib_accessor*);
-static long next_offset(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_to_double
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in to_double */
-    const char* key;
-    long start;
-    size_t length;
-    long scale;
-} grib_accessor_to_double;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_to_double = {
-    &grib_accessor_class_gen,                      /* super */
-    "to_double",                      /* name */
-    sizeof(grib_accessor_to_double),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    &next_offset,                /* next_offset */
-    &string_length,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_to_double = &_grib_accessor_class_to_double;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    grib_accessor_to_double* self = (grib_accessor_to_double*)a;
-
-    self->key    = grib_arguments_get_name(grib_handle_of_accessor(a), arg, 0);
-    self->start  = grib_arguments_get_long(grib_handle_of_accessor(a), arg, 1);
-    self->length = grib_arguments_get_long(grib_handle_of_accessor(a), arg, 2);
-    self->scale  = grib_arguments_get_long(grib_handle_of_accessor(a), arg, 3);
-    if (!self->scale)
-        self->scale = 1;
-
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->length = 0;
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    grib_accessor_to_double* self = (grib_accessor_to_double*)a;
-    size_t size                   = 0;
-
-    int err = grib_get_size(grib_handle_of_accessor(a), self->key, &size);
-    *count  = size;
-
-    return err;
-}
-
-static size_t string_length(grib_accessor* a)
-{
-    grib_accessor_to_double* self = (grib_accessor_to_double*)a;
-    size_t size                   = 0;
-
-    if (self->length)
-        return self->length;
-
-    grib_get_string_length_acc(a, &size);
-    return size;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    grib_dump_string(dumper, a, NULL);
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_LONG;
-}
-
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    grib_accessor_to_double* self = (grib_accessor_to_double*)a;
-
-    int err = 0;
-    char buff[512] = {0,};
-    size_t size = 512;
-    size_t length = string_length(a);
-
-    if (*len < length + 1) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "unpack_string: Wrong size (%lu) for %s, it contains %ld values",
-                *len, a->name, a->length + 1);
-        *len = length + 1;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    err = grib_get_string(grib_handle_of_accessor(a), self->key, buff, &size);
-    if (err)
-        return err;
-    if (length > size) {
-        err    = GRIB_STRING_TOO_SMALL;
-        length = size;
-    }
-
-    memcpy(val, buff + self->start, length);
-
-    val[length] = 0;
-    *len = length;
-    return err;
-}
-
-static int unpack_long(grib_accessor* a, long* v, size_t* len)
-{
-    grib_accessor_to_double* self = (grib_accessor_to_double*)a;
-    char val[1024]                = {0,};
-    size_t l   = sizeof(val);
-    char* last = NULL;
-    int err    = grib_unpack_string(a, val, &l);
-
-    if (err)
-        return err;
-
-    *v = strtol(val, &last, 10);
-    if (*last) {
-        err = GRIB_WRONG_CONVERSION;
-    }
-    *v /= self->scale;
-
-    return err;
-}
-
-static int unpack_double(grib_accessor* a, double* v, size_t* len)
-{
-    grib_accessor_to_double* self = (grib_accessor_to_double*)a;
-    char val[1024]                = {0,};
-    size_t l   = sizeof(val);
-    char* last = NULL;
-    int err    = grib_unpack_string(a, val, &l);
-
-    if (err)
-        return err;
-
-    *v = strtod(val, &last);
-    if (*last) {
-        err = GRIB_WRONG_CONVERSION;
-    }
-    *v /= self->scale;
-
-    return err;
-}
-
-static long next_offset(grib_accessor* a)
-{
-    return a->offset + a->length;
-}
diff --git a/src/accessor/todo/grib_accessor_class_to_integer.cc b/src/accessor/todo/grib_accessor_class_to_integer.cc
deleted file mode 100644
index 76ce1205d..000000000
--- a/src/accessor/todo/grib_accessor_class_to_integer.cc
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = unpack_string;pack_string
-   IMPLEMENTS = unpack_long;pack_long
-   IMPLEMENTS = unpack_double;pack_double
-   IMPLEMENTS = init;dump;string_length
-   IMPLEMENTS = value_count
-   IMPLEMENTS = next_offset
-   IMPLEMENTS = get_native_type
-   MEMBERS = const char* key
-   MEMBERS = long start
-   MEMBERS = size_t length
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int pack_string(grib_accessor*, const char*, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static size_t string_length(grib_accessor*);
-static long next_offset(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_to_integer
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in to_integer */
-    const char* key;
-    long start;
-    size_t length;
-} grib_accessor_to_integer;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_to_integer = {
-    &grib_accessor_class_gen,                      /* super */
-    "to_integer",                      /* name */
-    sizeof(grib_accessor_to_integer),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    &next_offset,                /* next_offset */
-    &string_length,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    &pack_string,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_to_integer = &_grib_accessor_class_to_integer;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    grib_accessor_to_integer* self = (grib_accessor_to_integer*)a;
-
-    self->key    = grib_arguments_get_name(grib_handle_of_accessor(a), arg, 0);
-    self->start  = grib_arguments_get_long(grib_handle_of_accessor(a), arg, 1);
-    self->length = grib_arguments_get_long(grib_handle_of_accessor(a), arg, 2);
-
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->length = 0;
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    grib_accessor_to_integer* self = (grib_accessor_to_integer*)a;
-    size_t size                    = 0;
-
-    int err = grib_get_size(grib_handle_of_accessor(a), self->key, &size);
-    *count  = size;
-
-    return err;
-}
-
-static size_t string_length(grib_accessor* a)
-{
-    grib_accessor_to_integer* self = (grib_accessor_to_integer*)a;
-    size_t size                    = 0;
-
-    if (self->length)
-        return self->length;
-
-    grib_get_string_length(grib_handle_of_accessor(a), self->key, &size);
-    return size;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    grib_dump_long(dumper, a, NULL);
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_LONG;
-}
-
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    grib_accessor_to_integer* self = (grib_accessor_to_integer*)a;
-
-    int err = 0;
-    char buff[512] = {0,};
-    size_t size = 512;
-
-    size_t length = string_length(a);
-
-    if (*len < length + 1) {
-        const char* cclass_name = a->cclass->name;
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
-                         cclass_name, a->name, length+1, *len);
-        *len = length + 1;
-        return GRIB_BUFFER_TOO_SMALL;
-    }
-
-    err = grib_get_string(grib_handle_of_accessor(a), self->key, buff, &size);
-    if (err)
-        return err;
-    if (length > size) {
-        /*err=GRIB_STRING_TOO_SMALL;*/
-        length = size;
-    }
-
-    memcpy(val, buff + self->start, length);
-
-    val[length] = 0;
-    *len = length;
-    return GRIB_SUCCESS;
-}
-
-static int pack_string(grib_accessor* a, const char* val, size_t* len)
-{
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static int pack_long(grib_accessor* a, const long* v, size_t* len)
-{
-    grib_context_log(a->context, GRIB_LOG_ERROR, "Should not pack %s as an integer", a->name);
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static int pack_double(grib_accessor* a, const double* v, size_t* len)
-{
-    grib_context_log(a->context, GRIB_LOG_ERROR, "Should not pack %s as a double", a->name);
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static int unpack_long(grib_accessor* a, long* v, size_t* len)
-{
-    char val[1024] = {0,};
-    size_t l   = sizeof(val);
-    char* last = NULL;
-    int err    = unpack_string(a, val, &l);
-
-    if (err)
-        return err;
-
-    *v = strtol(val, &last, 10);
-    /* if (*last) {err=GRIB_WRONG_CONVERSION;} */
-
-    return GRIB_SUCCESS;
-}
-
-static int unpack_double(grib_accessor* a, double* v, size_t* len)
-{
-    size_t l = 1;
-    long val = 0;
-    int err  = unpack_long(a, &val, &l);
-
-    *v = (double)val;
-    return err;
-}
-
-static long next_offset(grib_accessor* a)
-{
-    return a->offset + a->length;
-}
diff --git a/src/accessor/todo/grib_accessor_class_to_string.cc b/src/accessor/todo/grib_accessor_class_to_string.cc
deleted file mode 100644
index 648edd1aa..000000000
--- a/src/accessor/todo/grib_accessor_class_to_string.cc
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = unpack_string
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = unpack_double
-   IMPLEMENTS = init;dump;string_length
-   IMPLEMENTS = value_count
-   IMPLEMENTS = next_offset
-   IMPLEMENTS = get_native_type
-   MEMBERS = const char* key
-   MEMBERS = long start
-   MEMBERS = size_t length
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static size_t string_length(grib_accessor*);
-static long next_offset(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_to_string
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in to_string */
-    const char* key;
-    long start;
-    size_t length;
-} grib_accessor_to_string;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_to_string = {
-    &grib_accessor_class_gen,                      /* super */
-    "to_string",                      /* name */
-    sizeof(grib_accessor_to_string),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    &next_offset,                /* next_offset */
-    &string_length,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_to_string = &_grib_accessor_class_to_string;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    grib_accessor_to_string* self = (grib_accessor_to_string*)a;
-
-    self->key    = grib_arguments_get_name(grib_handle_of_accessor(a), arg, 0);
-    self->start  = grib_arguments_get_long(grib_handle_of_accessor(a), arg, 1);
-    self->length = grib_arguments_get_long(grib_handle_of_accessor(a), arg, 2);
-
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->length = 0;
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    grib_accessor_to_string* self = (grib_accessor_to_string*)a;
-    size_t size                   = 0;
-
-    int err = grib_get_size(grib_handle_of_accessor(a), self->key, &size);
-    *count  = size;
-
-    return err;
-}
-
-static size_t string_length(grib_accessor* a)
-{
-    grib_accessor_to_string* self = (grib_accessor_to_string*)a;
-
-    if (self->length)
-        return self->length;
-
-    size_t size = 0;
-    grib_get_string_length(grib_handle_of_accessor(a), self->key, &size);
-    return size;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    grib_dump_string(dumper, a, NULL);
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_STRING;
-}
-
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    grib_accessor_to_string* self = (grib_accessor_to_string*)a;
-
-    int err = 0;
-    char buff[512] = {0,};
-
-    size_t length = string_length(a);
-
-    if (*len < length + 1) {
-        const char* cclass_name = a->cclass->name;
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
-                         cclass_name, a->name, length+1, *len);
-        *len = length + 1;
-        return GRIB_BUFFER_TOO_SMALL;
-    }
-
-    size_t size = sizeof(buff);
-    err = grib_get_string(grib_handle_of_accessor(a), self->key, buff, &size);
-    if (err)
-        return err;
-    if (length > size) {
-        /*err=GRIB_STRING_TOO_SMALL;*/
-        length = size;
-    }
-
-    memcpy(val, buff + self->start, length);
-
-    val[length] = 0;
-    *len = length;
-    return GRIB_SUCCESS;
-}
-
-static int unpack_long(grib_accessor* a, long* v, size_t* len)
-{
-    char val[1024] = {0,};
-    size_t l   = sizeof(val);
-    char* last = NULL;
-    int err    = unpack_string(a, val, &l);
-
-    if (err)
-        return err;
-
-    *v = strtol(val, &last, 10);
-    if (*last) {
-        err = GRIB_WRONG_CONVERSION;
-    }
-
-    return err;
-}
-
-static int unpack_double(grib_accessor* a, double* v, size_t* len)
-{
-    size_t l = 1;
-    long val = 0;
-    int err  = unpack_long(a, &val, &l);
-
-    *v = (double)val;
-    return err;
-}
-
-static long next_offset(grib_accessor* a)
-{
-    return a->offset + a->length;
-}
diff --git a/src/accessor/todo/grib_accessor_class_transient_darray.cc b/src/accessor/todo/grib_accessor_class_transient_darray.cc
deleted file mode 100644
index ba830849a..000000000
--- a/src/accessor/todo/grib_accessor_class_transient_darray.cc
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = unpack_double;pack_double
-   IMPLEMENTS = unpack_long;pack_long;destroy
-   IMPLEMENTS = init;dump;value_count
-   IMPLEMENTS = get_native_type
-   MEMBERS=grib_darray* arr
-   MEMBERS=int type;
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void destroy(grib_context*, grib_accessor*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_transient_darray
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in transient_darray */
-    grib_darray* arr;
-    int type;
-} grib_accessor_transient_darray;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_transient_darray = {
-    &grib_accessor_class_gen,                      /* super */
-    "transient_darray",                      /* name */
-    sizeof(grib_accessor_transient_darray),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    &destroy,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_transient_darray = &_grib_accessor_class_transient_darray;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long length, grib_arguments* args)
-{
-    grib_accessor_transient_darray* self = (grib_accessor_transient_darray*)a;
-    self->arr                            = NULL;
-    self->type                           = GRIB_TYPE_DOUBLE;
-    a->length                            = 0;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    grib_dump_double(dumper, a, NULL);
-}
-
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_transient_darray* self = (grib_accessor_transient_darray*)a;
-
-    if (self->arr)
-        grib_darray_delete(a->context, self->arr);
-    self->arr = grib_darray_new(a->context, *len, 10);
-
-    for (size_t i = 0; i < *len; i++)
-        grib_darray_push(a->context, self->arr, val[i]);
-
-    return GRIB_SUCCESS;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_transient_darray* self = (grib_accessor_transient_darray*)a;
-
-    if (self->arr)
-        grib_darray_delete(a->context, self->arr);
-    self->arr = grib_darray_new(a->context, *len, 10);
-
-    for (size_t i = 0; i < *len; i++)
-        grib_darray_push(a->context, self->arr, (double)val[i]);
-
-    return GRIB_SUCCESS;
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_transient_darray* self = (grib_accessor_transient_darray*)a;
-    long count = 0;
-
-    value_count(a, &count);
-
-    if (*len < count) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s (setting %ld, required %ld) ", a->name, *len, count);
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    *len = count;
-    for (size_t i = 0; i < *len; i++)
-        val[i] = self->arr->v[i];
-
-    return GRIB_SUCCESS;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_transient_darray* self = (grib_accessor_transient_darray*)a;
-    long count = 0;
-
-    value_count(a, &count);
-
-    if (*len < count) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s (setting %ld, required %ld) ", a->name, *len, count);
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    *len = count;
-    for (size_t i = 0; i < *len; i++)
-        val[i] = (long)self->arr->v[i];
-
-    return GRIB_SUCCESS;
-}
-
-static void destroy(grib_context* c, grib_accessor* a)
-{
-    grib_accessor_transient_darray* self = (grib_accessor_transient_darray*)a;
-    if (self->arr)
-        grib_darray_delete(a->context, self->arr);
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    grib_accessor_transient_darray* self = (grib_accessor_transient_darray*)a;
-    if (self->arr)
-        *count = grib_darray_used_size(self->arr);
-    else
-        *count = 0;
-
-    return 0;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    const grib_accessor_transient_darray* self = (grib_accessor_transient_darray*)a;
-    return self->type;
-}
diff --git a/src/accessor/todo/grib_accessor_class_trim.cc b/src/accessor/todo/grib_accessor_class_trim.cc
deleted file mode 100644
index 21948ab82..000000000
--- a/src/accessor/todo/grib_accessor_class_trim.cc
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_ascii
-   IMPLEMENTS = unpack_string;pack_string
-   IMPLEMENTS = init; string_length
-   MEMBERS=  const char* input
-   MEMBERS=  int trim_left
-   MEMBERS=  int trim_right
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_string(grib_accessor*, const char*, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static size_t string_length(grib_accessor*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_trim
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in ascii */
-    /* Members defined in trim */
-    const char* input;
-    int trim_left;
-    int trim_right;
-} grib_accessor_trim;
-
-extern grib_accessor_class* grib_accessor_class_ascii;
-
-static grib_accessor_class _grib_accessor_class_trim = {
-    &grib_accessor_class_ascii,                      /* super */
-    "trim",                      /* name */
-    sizeof(grib_accessor_trim),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    &string_length,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    &pack_string,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_trim = &_grib_accessor_class_trim;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long l, grib_arguments* arg)
-{
-    int n                    = 0;
-    grib_accessor_trim* self = (grib_accessor_trim*)a;
-    grib_handle* h           = grib_handle_of_accessor(a);
-
-    self->input     = grib_arguments_get_name(h, arg, n++);
-    self->trim_left = grib_arguments_get_long(h, arg, n++);
-    self->trim_right= grib_arguments_get_long(h, arg, n++);
-    DEBUG_ASSERT(self->trim_left == 0 || self->trim_left == 1);
-    DEBUG_ASSERT(self->trim_right == 0 || self->trim_right == 1);
-}
-
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    grib_accessor_trim* self = (grib_accessor_trim*)a;
-
-    int err        = 0;
-    grib_handle* h = grib_handle_of_accessor(a);
-    char input[256] = {0,};
-    size_t size    = sizeof(input) / sizeof(*input);
-    char* pInput   = input;
-
-    err = grib_get_string(h, self->input, input, &size);
-    if (err) return err;
-
-    string_lrtrim(&pInput, self->trim_left, self->trim_right);
-    snprintf(val, 1024, "%s", pInput);
-    size = strlen(val);
-    *len = size + 1;
-    return GRIB_SUCCESS;
-}
-
-static int pack_string(grib_accessor* a, const char* val, size_t* len)
-{
-    char input[256] = {0,};
-
-    size_t inputLen = 256;
-    char buf[256]   = {0,};
-    char* pBuf = NULL;
-    int err;
-    grib_handle* h = grib_handle_of_accessor(a);
-    grib_accessor_trim* self = (grib_accessor_trim*)a;
-    grib_accessor* inputAccesstor = grib_find_accessor(h, self->input);
-    if (!inputAccesstor) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "Accessor for %s not found", self->input);
-        return GRIB_NOT_FOUND;
-    }
-
-    if ((err = grib_get_string(h, self->input, input, &inputLen)) != GRIB_SUCCESS)
-        return err;
-
-    snprintf(buf, sizeof(buf), "%s", val);
-    pBuf = buf;
-    string_lrtrim(&pBuf, self->trim_left, self->trim_right);
-
-    return grib_pack_string(inputAccesstor, pBuf, len);
-}
-
-static size_t string_length(grib_accessor* a)
-{
-    return 1024;
-}
diff --git a/src/accessor/todo/grib_accessor_class_uint16.cc b/src/accessor/todo/grib_accessor_class_uint16.cc
deleted file mode 100644
index 4bac26b59..000000000
--- a/src/accessor/todo/grib_accessor_class_uint16.cc
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = get_native_type
-   END_CLASS_DEF
-
-*/
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-
-typedef struct grib_accessor_uint16
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in uint16 */
-} grib_accessor_uint16;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_uint16 = {
-    &grib_accessor_class_gen,                      /* super */
-    "uint16",                      /* name */
-    sizeof(grib_accessor_uint16),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    0,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_uint16 = &_grib_accessor_class_uint16;
-
-/* END_CLASS_IMP */
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    long value = 0;
-    /*long pos = a->offset;*/
-    /*unsigned char* data = grib_handle_of_accessor(a)->buffer->data;*/
-
-    if (*len < 1) {
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    *val = value;
-    *len = 1;
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_LONG;
-}
diff --git a/src/accessor/todo/grib_accessor_class_uint32.cc b/src/accessor/todo/grib_accessor_class_uint32.cc
deleted file mode 100644
index b45b7451f..000000000
--- a/src/accessor/todo/grib_accessor_class_uint32.cc
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = get_native_type
-   END_CLASS_DEF
-
-*/
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-
-typedef struct grib_accessor_uint32
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in uint32 */
-} grib_accessor_uint32;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_uint32 = {
-    &grib_accessor_class_gen,                      /* super */
-    "uint32",                      /* name */
-    sizeof(grib_accessor_uint32),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    0,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_uint32 = &_grib_accessor_class_uint32;
-
-/* END_CLASS_IMP */
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    long value = 0;
-    /* long pos = a->offset; */
-    /* unsigned char* data = grib_handle_of_accessor(a)->buffer->data; */
-
-    if (*len < 1) {
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    *val = value;
-    *len = 1;
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_LONG;
-}
diff --git a/src/accessor/todo/grib_accessor_class_uint32_little_endian.cc b/src/accessor/todo/grib_accessor_class_uint32_little_endian.cc
deleted file mode 100644
index 3e39e0586..000000000
--- a/src/accessor/todo/grib_accessor_class_uint32_little_endian.cc
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = get_native_type
-   END_CLASS_DEF
-
-*/
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-
-typedef struct grib_accessor_uint32_little_endian
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in uint32_little_endian */
-} grib_accessor_uint32_little_endian;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_uint32_little_endian = {
-    &grib_accessor_class_gen,                      /* super */
-    "uint32_little_endian",                      /* name */
-    sizeof(grib_accessor_uint32_little_endian),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    0,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_uint32_little_endian = &_grib_accessor_class_uint32_little_endian;
-
-/* END_CLASS_IMP */
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    long value = 0;
-    /* long pos = a->offset; */
-    /* unsigned char* data = grib_handle_of_accessor(a)->buffer->data; */
-
-    if (*len < 1) {
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    *val = value;
-    *len = 1;
-    return GRIB_NOT_IMPLEMENTED;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_LONG;
-}
diff --git a/src/accessor/todo/grib_accessor_class_uint64.cc b/src/accessor/todo/grib_accessor_class_uint64.cc
deleted file mode 100644
index 20bd7e194..000000000
--- a/src/accessor/todo/grib_accessor_class_uint64.cc
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = get_native_type
-   END_CLASS_DEF
-
-*/
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-
-typedef struct grib_accessor_uint64
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in uint64 */
-} grib_accessor_uint64;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_uint64 = {
-    &grib_accessor_class_gen,                      /* super */
-    "uint64",                      /* name */
-    sizeof(grib_accessor_uint64),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    0,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_uint64 = &_grib_accessor_class_uint64;
-
-/* END_CLASS_IMP */
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    long value                = 0;
-    long pos                  = a->offset;
-    unsigned char* data       = grib_handle_of_accessor(a)->buffer->data;
-    unsigned long long result = 0, tmp;
-    int i;
-
-    if (*len < 1) {
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    for (i = 0; i < 8; i++) {
-        result <<= 8;
-        result |= data[pos + i];
-    }
-
-    value = result;
-    tmp   = value;
-
-    /* Result does not fit in long */
-    if (tmp != result) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "Value for %s cannot be decoded as a 'long' (%llu)", a->name, result);
-        return GRIB_DECODING_ERROR;
-    }
-
-    *val = value;
-    *len = 1;
-    return GRIB_SUCCESS;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_LONG;
-}
diff --git a/src/accessor/todo/grib_accessor_class_uint64_little_endian.cc b/src/accessor/todo/grib_accessor_class_uint64_little_endian.cc
deleted file mode 100644
index 0553aefbf..000000000
--- a/src/accessor/todo/grib_accessor_class_uint64_little_endian.cc
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = get_native_type
-   END_CLASS_DEF
-
-*/
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-
-typedef struct grib_accessor_uint64_little_endian
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in uint64_little_endian */
-} grib_accessor_uint64_little_endian;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_uint64_little_endian = {
-    &grib_accessor_class_gen,                      /* super */
-    "uint64_little_endian",                      /* name */
-    sizeof(grib_accessor_uint64_little_endian),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    0,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_uint64_little_endian = &_grib_accessor_class_uint64_little_endian;
-
-/* END_CLASS_IMP */
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    long value                = 0;
-    long pos                  = a->offset;
-    unsigned char* data       = grib_handle_of_accessor(a)->buffer->data;
-    unsigned long long result = 0, tmp;
-    int i;
-
-    if (*len < 1) {
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    for (i = 7; i >= 0; i--) {
-        result <<= 8;
-        result |= data[pos + i];
-    }
-
-    value = result;
-    tmp   = value;
-
-    /* Result does not fit in long */
-    if (tmp != result) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "Value for %s cannot be decoded as a 'long' (%llu)", a->name, result);
-        return GRIB_DECODING_ERROR;
-    }
-
-    *val = value;
-    *len = 1;
-    return GRIB_SUCCESS;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_LONG;
-}
diff --git a/src/accessor/todo/grib_accessor_class_uint8.cc b/src/accessor/todo/grib_accessor_class_uint8.cc
deleted file mode 100644
index 3f4195eff..000000000
--- a/src/accessor/todo/grib_accessor_class_uint8.cc
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = get_native_type
-   END_CLASS_DEF
-
-*/
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-
-typedef struct grib_accessor_uint8
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in uint8 */
-} grib_accessor_uint8;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_uint8 = {
-    &grib_accessor_class_gen,                      /* super */
-    "uint8",                      /* name */
-    sizeof(grib_accessor_uint8),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    0,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_uint8 = &_grib_accessor_class_uint8;
-
-/* END_CLASS_IMP */
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    long value          = 0;
-    long pos            = a->offset;
-    unsigned char* data = grib_handle_of_accessor(a)->buffer->data;
-
-    if (*len < 1) {
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    value = data[pos];
-
-    *val = value;
-    *len = 1;
-    return GRIB_SUCCESS;
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_LONG;
-}
diff --git a/src/accessor/todo/grib_accessor_class_unexpanded_descriptors.cc b/src/accessor/todo/grib_accessor_class_unexpanded_descriptors.cc
deleted file mode 100644
index a026388f2..000000000
--- a/src/accessor/todo/grib_accessor_class_unexpanded_descriptors.cc
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long;pack_long
-   IMPLEMENTS = init
-   IMPLEMENTS = next_offset
-   IMPLEMENTS = value_count
-   IMPLEMENTS = byte_offset
-   IMPLEMENTS = update_size
-   MEMBERS    = grib_accessor* unexpandedDescriptorsEncoded
-   MEMBERS    = const char* createNewData
-
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static long byte_offset(grib_accessor*);
-static long next_offset(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static void update_size(grib_accessor*, size_t);
-
-typedef struct grib_accessor_unexpanded_descriptors
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in unexpanded_descriptors */
-    grib_accessor* unexpandedDescriptorsEncoded;
-    const char* createNewData;
-} grib_accessor_unexpanded_descriptors;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_unexpanded_descriptors = {
-    &grib_accessor_class_long,                      /* super */
-    "unexpanded_descriptors",                      /* name */
-    sizeof(grib_accessor_unexpanded_descriptors),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    &next_offset,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    &byte_offset,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    &update_size,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_unexpanded_descriptors = &_grib_accessor_class_unexpanded_descriptors;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* args)
-{
-    grib_accessor_unexpanded_descriptors* self = (grib_accessor_unexpanded_descriptors*)a;
-    int n                                      = 0;
-    grib_handle* hand                          = grib_handle_of_accessor(a);
-    self->unexpandedDescriptorsEncoded         = grib_find_accessor(hand, grib_arguments_get_name(hand, args, n++));
-    self->createNewData                        = grib_arguments_get_name(hand, args, n++);
-    a->length                                  = 0;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_unexpanded_descriptors* self = (grib_accessor_unexpanded_descriptors*)a;
-    int ret                                    = 0;
-    long pos                                   = 0;
-    long rlen                                  = 0;
-    long f, x, y;
-    long* v = val;
-    long i;
-    grib_handle* hand = grib_handle_of_accessor(a);
-
-    pos = accessor_raw_get_offset(self->unexpandedDescriptorsEncoded) * 8;
-
-    ret = value_count(a, &rlen);
-    if (ret)
-        return ret;
-
-    if (rlen == 0) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "No descriptors in section 3. Malformed message.");
-        return GRIB_MESSAGE_MALFORMED;
-    }
-
-    if (*len < rlen) {
-        /* grib_context_log(a->context, GRIB_LOG_ERROR, */
-        /* " wrong size (%ld) for %s it contains %d values ",*len, a->name , rlen); */
-        *len = 0;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    for (i = 0; i < rlen; i++) {
-        f    = grib_decode_unsigned_long(hand->buffer->data, &pos, 2);
-        x    = grib_decode_unsigned_long(hand->buffer->data, &pos, 6);
-        y    = grib_decode_unsigned_long(hand->buffer->data, &pos, 8);
-        *v++ = f * 100000 + x * 1000 + y;
-    }
-    *len = rlen;
-    return GRIB_SUCCESS;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_unexpanded_descriptors* self = (grib_accessor_unexpanded_descriptors*)a;
-    int ret                                    = 0;
-    long pos                                   = 0;
-    unsigned long f, x, y;
-    unsigned char* buf      = NULL;
-    grib_accessor* expanded = NULL;
-    size_t buflen           = *len * 2;
-    size_t i = 0, length = *len;
-    long createNewData = 1;
-    grib_handle* hand  = grib_handle_of_accessor(a);
-
-    grib_get_long(hand, self->createNewData, &createNewData);
-
-    buf = (unsigned char*)grib_context_malloc_clear(a->context, buflen);
-
-    for (i = 0; i < length; i++) {
-        const long tmp = val[i] % 100000;
-        f              = val[i] / 100000;
-        x              = tmp / 1000;
-        y              = tmp % 1000;
-        grib_encode_unsigned_longb(buf, f, &pos, 2);
-        grib_encode_unsigned_longb(buf, x, &pos, 6);
-        grib_encode_unsigned_longb(buf, y, &pos, 8);
-    }
-
-    grib_pack_bytes(self->unexpandedDescriptorsEncoded, buf, &buflen);
-    grib_context_free(hand->context, buf);
-
-    if (createNewData == 0)
-        return ret;
-
-    expanded = grib_find_accessor(hand, "expandedCodes");
-    Assert(expanded != NULL);
-    ret = grib_accessor_class_expanded_descriptors_set_do_expand(expanded, 1);
-    if (ret != GRIB_SUCCESS)
-        return ret;
-
-    ret = grib_set_long(hand, "unpack", 3); /* BUFR new data */
-    if (ret != GRIB_SUCCESS)
-        return ret;
-
-    ret = grib_set_long(hand, "unpack", 1); /* Unpack structure */
-
-    return ret;
-}
-
-static int value_count(grib_accessor* a, long* numberOfUnexpandedDescriptors)
-{
-    grib_accessor_unexpanded_descriptors* self = (grib_accessor_unexpanded_descriptors*)a;
-    long n                                     = 0;
-
-    grib_value_count(self->unexpandedDescriptorsEncoded, &n);
-    *numberOfUnexpandedDescriptors = n / 2;
-
-    return 0;
-}
-
-static long byte_offset(grib_accessor* a)
-{
-    return a->offset;
-}
-
-static void update_size(grib_accessor* a, size_t s)
-{
-    a->length = s;
-}
-
-static long next_offset(grib_accessor* a)
-{
-    return byte_offset(a) + a->length;
-}
diff --git a/src/accessor/todo/grib_accessor_class_unpack_bufr_values.cc b/src/accessor/todo/grib_accessor_class_unpack_bufr_values.cc
deleted file mode 100644
index cac0cdfd7..000000000
--- a/src/accessor/todo/grib_accessor_class_unpack_bufr_values.cc
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = init;dump
-   IMPLEMENTS = unpack_string;unpack_string_array;unpack_long; unpack_double
-   IMPLEMENTS = pack_long; pack_double
-   IMPLEMENTS = value_count; destroy; get_native_type;
-   MEMBERS    = grib_accessor* data_accessor
-
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_double(grib_accessor*, const double* val, size_t* len);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static int unpack_string_array(grib_accessor*, char**, size_t* len);
-static int value_count(grib_accessor*, long*);
-static void destroy(grib_context*, grib_accessor*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_unpack_bufr_values
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in unpack_bufr_values */
-    grib_accessor* data_accessor;
-} grib_accessor_unpack_bufr_values;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_unpack_bufr_values = {
-    &grib_accessor_class_gen,                      /* super */
-    "unpack_bufr_values",                      /* name */
-    sizeof(grib_accessor_unpack_bufr_values),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    &destroy,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    &pack_double,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    &unpack_string_array,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_unpack_bufr_values = &_grib_accessor_class_unpack_bufr_values;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* params)
-{
-    char* key;
-    grib_accessor_unpack_bufr_values* self = (grib_accessor_unpack_bufr_values*)a;
-    key                                    = (char*)grib_arguments_get_name(grib_handle_of_accessor(a), params, 0);
-    self->data_accessor                    = grib_find_accessor(grib_handle_of_accessor(a), key);
-
-    a->length = 0;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-}
-
-static int unpack_string_array(grib_accessor* a, char** buffer, size_t* len)
-{
-    grib_accessor_unpack_bufr_values* self = (grib_accessor_unpack_bufr_values*)a;
-    grib_accessor* data                    = (grib_accessor*)self->data_accessor;
-
-    return grib_unpack_double(data, 0, 0);
-}
-
-static int unpack_string(grib_accessor* a, char* buffer, size_t* len)
-{
-    grib_accessor_unpack_bufr_values* self = (grib_accessor_unpack_bufr_values*)a;
-    grib_accessor* data                    = (grib_accessor*)self->data_accessor;
-    strcpy(buffer, "0");
-    *len=1;
-
-    return grib_unpack_double(data, 0, 0);
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_unpack_bufr_values* self = (grib_accessor_unpack_bufr_values*)a;
-    grib_accessor* data                    = (grib_accessor*)self->data_accessor;
-
-    return grib_unpack_double(data, 0, 0);
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    grib_accessor_unpack_bufr_values* self = (grib_accessor_unpack_bufr_values*)a;
-    grib_accessor* data                    = (grib_accessor*)self->data_accessor;
-
-    return grib_unpack_double(data, 0, 0);
-}
-
-static int value_count(grib_accessor* a, long* count)
-{
-    *count = 1;
-    return 0;
-}
-
-static void destroy(grib_context* context, grib_accessor* a)
-{
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_LONG;
-}
-
-// static const char* mode_to_str(int p)
-// {
-//     if (p==CODES_BUFR_UNPACK_STRUCTURE) return "CODES_BUFR_UNPACK_STRUCTURE";
-//     if (p==CODES_BUFR_UNPACK_FLAT)      return "CODES_BUFR_UNPACK_FLAT";
-//     if (p==CODES_BUFR_NEW_DATA)         return "CODES_BUFR_NEW_DATA";
-//     return "unknown proc flag";
-// }
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    int unpackMode                         = CODES_BUFR_UNPACK_STRUCTURE;
-    grib_accessor_unpack_bufr_values* self = (grib_accessor_unpack_bufr_values*)a;
-    grib_accessor* data                    = (grib_accessor*)self->data_accessor;
-
-    if (*val == 2)
-        unpackMode = CODES_BUFR_UNPACK_FLAT;
-    if (*val == 3)
-        unpackMode = CODES_BUFR_NEW_DATA;
-
-    accessor_bufr_data_array_set_unpackMode(data, unpackMode);
-
-    return grib_unpack_double(data, 0, 0);
-}
-
-static int pack_double(grib_accessor* a, const double* val, size_t* len)
-{
-    grib_accessor_unpack_bufr_values* self = (grib_accessor_unpack_bufr_values*)a;
-    grib_accessor* data                    = (grib_accessor*)self->data_accessor;
-
-    return grib_unpack_double(data, 0, 0);
-}
diff --git a/src/accessor/todo/grib_accessor_class_unsigned_bits.cc b/src/accessor/todo/grib_accessor_class_unsigned_bits.cc
deleted file mode 100644
index 38c3425cf..000000000
--- a/src/accessor/todo/grib_accessor_class_unsigned_bits.cc
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long;pack_long
-   IMPLEMENTS = init
-   IMPLEMENTS = next_offset
-   IMPLEMENTS = byte_count
-   IMPLEMENTS = value_count
-   IMPLEMENTS = byte_offset
-   IMPLEMENTS = update_size
-   MEMBERS    = const char* numberOfBits
-   MEMBERS    = const char* numberOfElements
-
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static long byte_count(grib_accessor*);
-static long byte_offset(grib_accessor*);
-static long next_offset(grib_accessor*);
-static int value_count(grib_accessor*, long*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static void update_size(grib_accessor*, size_t);
-
-typedef struct grib_accessor_unsigned_bits
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in unsigned_bits */
-    const char* numberOfBits;
-    const char* numberOfElements;
-} grib_accessor_unsigned_bits;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_unsigned_bits = {
-    &grib_accessor_class_long,                      /* super */
-    "unsigned_bits",                      /* name */
-    sizeof(grib_accessor_unsigned_bits),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    &next_offset,                /* next_offset */
-    0,              /* get length of string */
-    &value_count,                /* get number of values */
-    &byte_count,                 /* get number of bytes */
-    &byte_offset,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    &update_size,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_unsigned_bits = &_grib_accessor_class_unsigned_bits;
-
-/* END_CLASS_IMP */
-
-
-static long compute_byte_count(grib_accessor* a)
-{
-    grib_accessor_unsigned_bits* self = (grib_accessor_unsigned_bits*)a;
-    long numberOfBits;
-    long numberOfElements;
-    int ret = 0;
-
-    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfBits, &numberOfBits);
-    if (ret) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "%s unable to get %s to compute size", a->name, self->numberOfBits);
-        return 0;
-    }
-
-    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfElements, &numberOfElements);
-    if (ret) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "%s unable to get %s to compute size", a->name, self->numberOfElements);
-        return 0;
-    }
-
-    return (numberOfBits * numberOfElements + 7) / 8;
-}
-
-
-static void init(grib_accessor* a, const long len, grib_arguments* args)
-{
-    grib_accessor_unsigned_bits* self = (grib_accessor_unsigned_bits*)a;
-    int n                             = 0;
-    self->numberOfBits                = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
-    self->numberOfElements            = grib_arguments_get_name(grib_handle_of_accessor(a), args, n++);
-    a->length                         = compute_byte_count(a);
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_unsigned_bits* self = (grib_accessor_unsigned_bits*)a;
-    int ret                           = 0;
-    long pos                          = a->offset * 8;
-    long rlen                         = 0;
-    long numberOfBits                 = 0;
-
-    ret = value_count(a, &rlen);
-    if (ret)
-        return ret;
-
-    if (*len < rlen) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "Wrong size (%ld) for %s, it contains %ld values", *len, a->name, rlen);
-        *len = rlen;
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-
-    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfBits, &numberOfBits);
-    if (ret)
-        return ret;
-    if (numberOfBits == 0) {
-        int i;
-        for (i = 0; i < rlen; i++)
-            val[i] = 0;
-        return GRIB_SUCCESS;
-    }
-
-    grib_decode_long_array(grib_handle_of_accessor(a)->buffer->data, &pos, numberOfBits, rlen, val);
-
-    *len = rlen;
-
-    return GRIB_SUCCESS;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_unsigned_bits* self = (grib_accessor_unsigned_bits*)a;
-    int ret                           = 0;
-    long off                          = 0;
-    long numberOfBits                 = 0;
-    size_t buflen                     = 0;
-    unsigned char* buf                = NULL;
-    unsigned long i                   = 0;
-    long rlen                         = 0;
-    ret                               = value_count(a, &rlen);
-    if (ret) return ret;
-
-    /*
-    if(*len < rlen)
-    {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-            "Wrong size for %s it contains %d values ", a->name , rlen );
-        return GRIB_ARRAY_TOO_SMALL;
-    }
-     */
-    if (*len != rlen)
-        ret = grib_set_long(grib_handle_of_accessor(a), self->numberOfElements, *len);
-    if (ret) return ret;
-
-    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfBits, &numberOfBits);
-    if (ret) return ret;
-    if (numberOfBits == 0) {
-        grib_buffer_replace(a, NULL, 0, 1, 1);
-        return GRIB_SUCCESS;
-    }
-
-    buflen = compute_byte_count(a);
-    buf    = (unsigned char*)grib_context_malloc_clear(a->context, buflen + sizeof(long));
-
-    for (i = 0; i < *len; i++)
-        grib_encode_unsigned_longb(buf, val[i], &off, numberOfBits);
-
-    grib_buffer_replace(a, buf, buflen, 1, 1);
-
-    grib_context_free(a->context, buf);
-
-    return ret;
-}
-
-static long byte_count(grib_accessor* a)
-{
-    return a->length;
-}
-
-static int value_count(grib_accessor* a, long* numberOfElements)
-{
-    grib_accessor_unsigned_bits* self = (grib_accessor_unsigned_bits*)a;
-    int ret;
-    *numberOfElements = 0;
-
-    ret = grib_get_long(grib_handle_of_accessor(a), self->numberOfElements, numberOfElements);
-    if (ret) {
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "%s unable to get %s to compute size", a->name, self->numberOfElements);
-    }
-
-    return ret;
-}
-
-static long byte_offset(grib_accessor* a)
-{
-    return a->offset;
-}
-
-static void update_size(grib_accessor* a, size_t s)
-{
-    a->length = s;
-}
-
-static long next_offset(grib_accessor* a)
-{
-    return byte_offset(a) + a->length;
-}
diff --git a/src/accessor/todo/grib_accessor_class_validity_date.cc b/src/accessor/todo/grib_accessor_class_validity_date.cc
deleted file mode 100644
index 760b7bccd..000000000
--- a/src/accessor/todo/grib_accessor_class_validity_date.cc
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = init
-   MEMBERS=const char* date
-   MEMBERS=const char* time
-   MEMBERS=const char* step
-   MEMBERS=const char* stepUnits
-   MEMBERS=const char* year
-   MEMBERS=const char* month
-   MEMBERS=const char* day
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_validity_date
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in validity_date */
-    const char* date;
-    const char* time;
-    const char* step;
-    const char* stepUnits;
-    const char* year;
-    const char* month;
-    const char* day;
-} grib_accessor_validity_date;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_validity_date = {
-    &grib_accessor_class_long,                      /* super */
-    "validity_date",                      /* name */
-    sizeof(grib_accessor_validity_date),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_validity_date = &_grib_accessor_class_validity_date;
-
-/* END_CLASS_IMP */
-
-/* Table of multipliers to convert step units to minutes */
-static const double u2m[] = {
-    1,            /* index 0:  minutes  */
-    60,           /* index 1:  hour     */
-    24 * 60,      /* index 2:  day      */
-    24 * 60 * 30, /* index 3:  month    */
-    -1,           /* index 4:  year     */
-    -1,           /* index 5:  decade   */
-    -1,           /* index 6:  30 years */
-    -1,           /* index 7:  century  */
-    -1,           /* index 8:  RESERVED */
-    -1,           /* index 9:  RESERVED */
-    3 * 60,       /* index 10: 3 hours  */
-    6 * 60,       /* index 11: 6 hours  */
-    12 * 60,      /* index 12: 12 hours */
-    1 / 60.0,     /* index 13: seconds  */
-    15,           /* index 14: 15 mins  */
-    30            /* index 15: 30 mins  */
-};
-
-static long convert_to_minutes(long step, long stepUnits)
-{
-    double result = 0;
-    if (stepUnits == 0)
-        return step; /* unit=minutes so no change */
-    if (stepUnits == 1)
-        return step * 60; /* unit=hours */
-    if (stepUnits == 13)
-        return step / 60; /* unit=seconds */
-    /* Assert( stepUnits < sizeof(u2m)/sizeof(u2m[0]) ); */
-
-    result = step * u2m[stepUnits];
-    return (long)result;
-}
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_validity_date* self = (grib_accessor_validity_date*)a;
-    grib_handle* hand                 = grib_handle_of_accessor(a);
-    int n                             = 0;
-
-    self->date      = grib_arguments_get_name(hand, c, n++);
-    self->time      = grib_arguments_get_name(hand, c, n++);
-    self->step      = grib_arguments_get_name(hand, c, n++);
-    self->stepUnits = grib_arguments_get_name(hand, c, n++);
-    self->year      = grib_arguments_get_name(hand, c, n++);
-    self->month     = grib_arguments_get_name(hand, c, n++);
-    self->day       = grib_arguments_get_name(hand, c, n++);
-
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_validity_date* self = (grib_accessor_validity_date*)a;
-    grib_handle* hand                 = grib_handle_of_accessor(a);
-    int ret                           = 0;
-    long date                         = 0;
-    long time                         = 0;
-    long step                         = 0;
-    long stepUnits                    = 0;
-    long hours = 0, minutes = 0, step_mins = 0, tmp, tmp_hrs;
-
-    if (self->year) {
-        long year, month, day;
-        if ((ret = grib_get_long_internal(hand, self->year, &year)) != GRIB_SUCCESS)
-            return ret;
-        if ((ret = grib_get_long_internal(hand, self->month, &month)) != GRIB_SUCCESS)
-            return ret;
-        if ((ret = grib_get_long_internal(hand, self->day, &day)) != GRIB_SUCCESS)
-            return ret;
-        *val = year * 10000 + month * 100 + day;
-        return GRIB_SUCCESS;
-    }
-    if ((ret = grib_get_long_internal(hand, self->date, &date)) != GRIB_SUCCESS)
-        return ret;
-    if ((ret = grib_get_long_internal(hand, self->time, &time)) != GRIB_SUCCESS)
-        return ret;
-    if ((ret = grib_get_long(hand, self->step, &step)) != GRIB_SUCCESS) {
-        if ((ret = grib_get_long_internal(hand, "endStep", &step)) != GRIB_SUCCESS) {
-            return ret; /* See ECC-817 */
-        }
-    }
-
-    if (self->stepUnits) {
-        if ((ret = grib_get_long_internal(hand, self->stepUnits, &stepUnits)) != GRIB_SUCCESS)
-            return ret;
-        step_mins = convert_to_minutes(step, stepUnits);
-    }
-
-    minutes = time % 100;
-    hours   = time / 100;
-    tmp     = minutes + step_mins; /* add the step to our minutes */
-    tmp_hrs = tmp / 60;            /* how many hours and mins is that? */
-    hours += tmp_hrs;              /* increment hours */
-
-    date = grib_date_to_julian(date);
-    /* does the new 'hours' exceed 24? if so increment julian */
-    while (hours >= 24) {
-        date++;
-        hours -= 24;
-    }
-    /* GRIB-29: Negative forecast time */
-    while (hours < 0) {
-        date--;
-        hours += 24;
-    }
-
-    if (*len < 1)
-        return GRIB_ARRAY_TOO_SMALL;
-
-    *val = grib_julian_to_date(date);
-
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_validity_time.cc b/src/accessor/todo/grib_accessor_class_validity_time.cc
deleted file mode 100644
index 34eb78128..000000000
--- a/src/accessor/todo/grib_accessor_class_validity_time.cc
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_long
-   IMPLEMENTS = unpack_long
-   IMPLEMENTS = unpack_string
-   IMPLEMENTS = init
-   MEMBERS=const char* date
-   MEMBERS=const char* time
-   MEMBERS=const char* step
-   MEMBERS=const char* stepUnits
-   MEMBERS=const char* hours
-   MEMBERS=const char* minutes
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_long(grib_accessor*, long* val, size_t* len);
-static int unpack_string(grib_accessor*, char*, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_validity_time
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in long */
-    /* Members defined in validity_time */
-    const char* date;
-    const char* time;
-    const char* step;
-    const char* stepUnits;
-    const char* hours;
-    const char* minutes;
-} grib_accessor_validity_time;
-
-extern grib_accessor_class* grib_accessor_class_long;
-
-static grib_accessor_class _grib_accessor_class_validity_time = {
-    &grib_accessor_class_long,                      /* super */
-    "validity_time",                      /* name */
-    sizeof(grib_accessor_validity_time),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    &unpack_long,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    &unpack_string,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_validity_time = &_grib_accessor_class_validity_time;
-
-/* END_CLASS_IMP */
-
-/* Table of multipliers to convert step units to minutes */
-static const double u2m[] = {
-    1,            /* index 0:  minutes  */
-    60,           /* index 1:  hour     */
-    24 * 60,      /* index 2:  day      */
-    24 * 60 * 30, /* index 3:  month    */
-    -1,           /* index 4:  year     */
-    -1,           /* index 5:  decade   */
-    -1,           /* index 6:  30 years */
-    -1,           /* index 7:  century  */
-    -1,           /* index 8:  RESERVED */
-    -1,           /* index 9:  RESERVED */
-    3 * 60,       /* index 10: 3 hours  */
-    6 * 60,       /* index 11: 6 hours  */
-    12 * 60,      /* index 12: 12 hours */
-    1 / 60.0,     /* index 13: seconds  */
-    15,           /* index 14: 15 mins  */
-    30            /* index 15: 30 mins  */
-};
-
-static long convert_to_minutes(long step, long stepUnits)
-{
-    double result = 0;
-    if (stepUnits == 0)
-        return step; /* unit=minutes so no change */
-    if (stepUnits == 1)
-        return step * 60; /* unit=hours */
-    if (stepUnits == 13)
-        return step / 60; /* unit=seconds*/
-    /* Assert( stepUnits < sizeof(u2m)/sizeof(u2m[0]) ); */
-
-    result = step * u2m[stepUnits];
-    return (long)result;
-}
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_validity_time* self = (grib_accessor_validity_time*)a;
-    grib_handle* hand                 = grib_handle_of_accessor(a);
-    int n                             = 0;
-
-    self->date      = grib_arguments_get_name(hand, c, n++);
-    self->time      = grib_arguments_get_name(hand, c, n++);
-    self->step      = grib_arguments_get_name(hand, c, n++);
-    self->stepUnits = grib_arguments_get_name(hand, c, n++);
-    self->hours     = grib_arguments_get_name(hand, c, n++);
-    self->minutes   = grib_arguments_get_name(hand, c, n++);
-
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-}
-
-static int unpack_long(grib_accessor* a, long* val, size_t* len)
-{
-    grib_accessor_validity_time* self = (grib_accessor_validity_time*)a;
-    grib_handle* hand                 = grib_handle_of_accessor(a);
-    int ret                           = 0;
-    long date                         = 0;
-    long time                         = 0;
-    long step                         = 0;
-    long stepUnits                    = 0;
-    long hours = 0, minutes = 0, step_mins = 0, tmp, tmp_hrs, tmp_mins;
-
-    if (self->hours) {
-        if ((ret = grib_get_long_internal(hand, self->hours, &hours)) != GRIB_SUCCESS)
-            return ret;
-        if ((ret = grib_get_long_internal(hand, self->minutes, &minutes)) != GRIB_SUCCESS)
-            return ret;
-        *val = hours * 100 + minutes;
-        return GRIB_SUCCESS;
-    }
-    if ((ret = grib_get_long_internal(hand, self->date, &date)) != GRIB_SUCCESS)
-        return ret;
-    if ((ret = grib_get_long_internal(hand, self->time, &time)) != GRIB_SUCCESS)
-        return ret;
-    if ((ret = grib_get_long(hand, self->step, &step)) != GRIB_SUCCESS) {
-        if ((ret = grib_get_long_internal(hand, "endStep", &step)) != GRIB_SUCCESS) {
-            return ret; /* See ECC-817 */
-        }
-    }
-
-    /* Seconds will always be zero. So convert to minutes */
-    if (self->stepUnits) {
-        if ((ret = grib_get_long_internal(hand, self->stepUnits, &stepUnits)) != GRIB_SUCCESS)
-            return ret;
-        step_mins = convert_to_minutes(step, stepUnits);
-    }
-
-    minutes  = time % 100;
-    hours    = time / 100;
-    tmp      = minutes + step_mins; /* add the step to our minutes */
-    tmp_hrs  = tmp / 60;            /* how many hours and mins is that? */
-    tmp_mins = tmp % 60;
-    hours += tmp_hrs; /* increment hours */
-    if (hours > 0) {
-        hours = hours % 24; /* wrap round if >= 24 */
-    }
-    else {
-        /* GRIB-29: Negative forecast time */
-        while (hours < 0) {
-            hours += 24;
-        }
-    }
-    time = hours * 100 + tmp_mins;
-
-    if (*len < 1)
-        return GRIB_ARRAY_TOO_SMALL;
-
-    *val = time;
-
-    return GRIB_SUCCESS;
-}
-
-static int unpack_string(grib_accessor* a, char* val, size_t* len)
-{
-    int err = 0;
-    long v  = 0;
-    size_t lsize = 1, lmin = 5;
-
-    err = unpack_long(a, &v, &lsize);
-    if (err) return err;
-
-    if (*len < lmin) {
-        const char* cclass_name = a->cclass->name;
-        grib_context_log(a->context, GRIB_LOG_ERROR,
-                         "%s: Buffer too small for %s. It is %zu bytes long (len=%zu)",
-                         cclass_name, a->name, lmin, *len);
-        *len = lmin;
-        return GRIB_BUFFER_TOO_SMALL;
-    }
-
-    snprintf(val, 64, "%04ld", v);
-
-    len[0] = lmin;
-    return GRIB_SUCCESS;
-}
diff --git a/src/accessor/todo/grib_accessor_class_values.cc b/src/accessor/todo/grib_accessor_class_values.cc
deleted file mode 100644
index 384282317..000000000
--- a/src/accessor/todo/grib_accessor_class_values.cc
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = init
-   IMPLEMENTS = dump
-   IMPLEMENTS = next_offset
-   IMPLEMENTS = byte_count
-   IMPLEMENTS = byte_offset
-   IMPLEMENTS = get_native_type
-   IMPLEMENTS = update_size
-   IMPLEMENTS = compare
-   IMPLEMENTS = pack_long
-   MEMBERS= int  carg
-   MEMBERS= const char* seclen
-   MEMBERS= const char* offsetdata
-   MEMBERS= const char* offsetsection
-   MEMBERS= int dirty
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static int pack_long(grib_accessor*, const long* val, size_t* len);
-static long byte_count(grib_accessor*);
-static long byte_offset(grib_accessor*);
-static long next_offset(grib_accessor*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static void update_size(grib_accessor*, size_t);
-static int compare(grib_accessor*, grib_accessor*);
-
-typedef struct grib_accessor_values
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in values */
-    int  carg;
-    const char* seclen;
-    const char* offsetdata;
-    const char* offsetsection;
-    int dirty;
-} grib_accessor_values;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_values = {
-    &grib_accessor_class_gen,                      /* super */
-    "values",                      /* name */
-    sizeof(grib_accessor_values),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    &next_offset,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    &byte_count,                 /* get number of bytes */
-    &byte_offset,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    &pack_long,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    &update_size,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    &compare,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_values = &_grib_accessor_class_values;
-
-/* END_CLASS_IMP */
-static long init_length(grib_accessor* a)
-{
-    grib_accessor_values* self = (grib_accessor_values*)a;
-    int ret                    = 0;
-
-    long seclen        = 0;
-    long offsetsection = 0;
-    long offsetdata    = 0;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->seclen, &seclen)))
-        return ret;
-
-    if (seclen == 0) {
-        /* printf("init_length seclen=0\n"); */
-        return 0;
-    }
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->offsetsection, &offsetsection)))
-        return ret;
-
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->offsetdata, &offsetdata)))
-        return ret;
-
-    /* When reparsing */
-    if (offsetdata < offsetsection) {
-        /* printf("init_length offsetdata < offsetsection=0\n"); */
-        Assert(grib_handle_of_accessor(a)->loader);
-        return 0;
-    }
-
-    return seclen - (offsetdata - offsetsection);
-}
-
-static void init(grib_accessor* a, const long v, grib_arguments* params)
-{
-    grib_accessor_values* self = (grib_accessor_values*)a;
-    self->carg                 = 0;
-
-    self->seclen        = grib_arguments_get_name(grib_handle_of_accessor(a), params, self->carg++);
-    self->offsetdata    = grib_arguments_get_name(grib_handle_of_accessor(a), params, self->carg++);
-    self->offsetsection = grib_arguments_get_name(grib_handle_of_accessor(a), params, self->carg++);
-    self->dirty         = 1;
-
-    a->length = init_length(a);
-    /* Assert(a->length>=0); */
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_DOUBLE;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    grib_dump_values(dumper, a);
-}
-
-static long byte_count(grib_accessor* a)
-{
-    grib_context_log(a->context, GRIB_LOG_DEBUG, "byte_count of %s = %ld", a->name, a->length);
-    return a->length;
-}
-
-static long byte_offset(grib_accessor* a)
-{
-    return a->offset;
-}
-
-static long next_offset(grib_accessor* a)
-{
-    return a->offset + a->length;
-}
-
-static void update_size(grib_accessor* a, size_t s)
-{
-    grib_context_log(a->context, GRIB_LOG_DEBUG, "updating size of %s old %ld new %ld", a->name, a->length, s);
-    a->length = s;
-    Assert(a->length >= 0);
-}
-
-static int compare(grib_accessor* a, grib_accessor* b)
-{
-    int retval   = 0;
-    double* aval = 0;
-    double* bval = 0;
-
-    size_t alen = 0;
-    size_t blen = 0;
-    int err     = 0;
-    long count  = 0;
-
-    err = grib_value_count(a, &count);
-    if (err)
-        return err;
-    alen = count;
-
-    err = grib_value_count(b, &count);
-    if (err)
-        return err;
-    blen = count;
-
-    if (alen != blen)
-        return GRIB_COUNT_MISMATCH;
-
-    aval = (double*)grib_context_malloc(a->context, alen * sizeof(double));
-    bval = (double*)grib_context_malloc(b->context, blen * sizeof(double));
-
-    grib_unpack_double(a, aval, &alen);
-    grib_unpack_double(b, bval, &blen);
-
-    retval = GRIB_SUCCESS;
-    for (size_t i=0; i<alen && retval == GRIB_SUCCESS; ++i) {
-        if (aval[i] != bval[i]) retval = GRIB_DOUBLE_VALUE_MISMATCH;
-    }
-
-    grib_context_free(a->context, aval);
-    grib_context_free(b->context, bval);
-
-    return retval;
-}
-
-static int pack_long(grib_accessor* a, const long* val, size_t* len)
-{
-    grib_accessor_values* self = (grib_accessor_values*)a;
-    double* dval = (double*)grib_context_malloc(a->context, *len * sizeof(double));
-
-    for (size_t i = 0; i < *len; i++)
-        dval[i] = (double)val[i];
-
-    int ret = grib_pack_double(a, dval, len);
-
-    grib_context_free(a->context, dval);
-
-    self->dirty = 1;
-
-    return ret;
-}
diff --git a/src/accessor/todo/grib_accessor_class_vector.cc b/src/accessor/todo/grib_accessor_class_vector.cc
deleted file mode 100644
index 1cc69a4c7..000000000
--- a/src/accessor/todo/grib_accessor_class_vector.cc
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-/**************************************
- *  Enrico Fucile
- **************************************/
-
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_abstract_vector
-   IMPLEMENTS = init
-   IMPLEMENTS = unpack_double
-   MEMBERS = const char* vector
-   MEMBERS = int index
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int unpack_double(grib_accessor*, double* val, size_t* len);
-static void init(grib_accessor*, const long, grib_arguments*);
-
-typedef struct grib_accessor_vector
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in abstract_vector */
-    double* v;
-    int number_of_elements;
-    /* Members defined in vector */
-    const char* vector;
-    int index;
-} grib_accessor_vector;
-
-extern grib_accessor_class* grib_accessor_class_abstract_vector;
-
-static grib_accessor_class _grib_accessor_class_vector = {
-    &grib_accessor_class_abstract_vector,                      /* super */
-    "vector",                      /* name */
-    sizeof(grib_accessor_vector),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    0,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    0,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    &unpack_double,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    0,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_vector = &_grib_accessor_class_vector;
-
-/* END_CLASS_IMP */
-
-typedef struct grib_accessor_abstract_vector
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in double */
-    /* Members defined in abstract_vector */
-    double* v;
-    int number_of_elements;
-} grib_accessor_abstract_vector;
-
-static void init(grib_accessor* a, const long l, grib_arguments* c)
-{
-    grib_accessor_vector* self = (grib_accessor_vector*)a;
-    int n                      = 0;
-
-    self->vector = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
-    self->index  = grib_arguments_get_long(grib_handle_of_accessor(a), c, n++);
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
-    a->length = 0;
-}
-
-static int unpack_double(grib_accessor* a, double* val, size_t* len)
-{
-    int err     = 0;
-    size_t size = 0;
-    double* stat;
-    grib_accessor_vector* self       = (grib_accessor_vector*)a;
-    grib_accessor* va                = (grib_accessor*)grib_find_accessor(grib_handle_of_accessor(a), self->vector);
-    grib_accessor_abstract_vector* v = (grib_accessor_abstract_vector*)va;
-
-    Assert(self->index >= 0);
-
-    if (self->index >= v->number_of_elements) {
-        grib_context_log(a->context, GRIB_LOG_FATAL, "index=%d number_of_elements=%d for %s", self->index, v->number_of_elements, a->name);
-        Assert(self->index < v->number_of_elements);
-    }
-
-    if (va->dirty) {
-        grib_get_size(grib_handle_of_accessor(a), self->vector, &size);
-        stat = (double*)grib_context_malloc_clear(a->context, sizeof(double) * size);
-        err  = grib_unpack_double(va, stat, &size);
-        grib_context_free(a->context, stat);
-        if (err)
-            return err;
-    }
-
-    *val = v->v[self->index];
-
-    return err;
-}
diff --git a/src/accessor/todo/grib_accessor_class_when.cc b/src/accessor/todo/grib_accessor_class_when.cc
deleted file mode 100644
index 1bf0d999e..000000000
--- a/src/accessor/todo/grib_accessor_class_when.cc
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = accessor
-   SUPER      = grib_accessor_class_gen
-   IMPLEMENTS = init;dump;
-   IMPLEMENTS = get_native_type
-   IMPLEMENTS = notify_change
-   END_CLASS_DEF
-
- */
-
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "accessor.class" and rerun ./make_class.pl
-
-*/
-
-static int get_native_type(grib_accessor*);
-static void dump(grib_accessor*, grib_dumper*);
-static void init(grib_accessor*, const long, grib_arguments*);
-static int notify_change(grib_accessor*, grib_accessor*);
-
-typedef struct grib_accessor_when
-{
-    grib_accessor att;
-    /* Members defined in gen */
-    /* Members defined in when */
-} grib_accessor_when;
-
-extern grib_accessor_class* grib_accessor_class_gen;
-
-static grib_accessor_class _grib_accessor_class_when = {
-    &grib_accessor_class_gen,                      /* super */
-    "when",                      /* name */
-    sizeof(grib_accessor_when),  /* size */
-    0,                           /* inited */
-    0,                           /* init_class */
-    &init,                       /* init */
-    0,                  /* post_init */
-    0,                    /* destroy */
-    &dump,                       /* dump */
-    0,                /* next_offset */
-    0,              /* get length of string */
-    0,                /* get number of values */
-    0,                 /* get number of bytes */
-    0,                /* get offset to bytes */
-    &get_native_type,            /* get native type */
-    0,                /* get sub_section */
-    0,               /* pack_missing */
-    0,                 /* is_missing */
-    0,                  /* pack_long */
-    0,                /* unpack_long */
-    0,                /* pack_double */
-    0,                 /* pack_float */
-    0,              /* unpack_double */
-    0,               /* unpack_float */
-    0,                /* pack_string */
-    0,              /* unpack_string */
-    0,          /* pack_string_array */
-    0,        /* unpack_string_array */
-    0,                 /* pack_bytes */
-    0,               /* unpack_bytes */
-    0,            /* pack_expression */
-    &notify_change,              /* notify_change */
-    0,                /* update_size */
-    0,             /* preferred_size */
-    0,                     /* resize */
-    0,      /* nearest_smaller_value */
-    0,                       /* next accessor */
-    0,                    /* compare vs. another accessor */
-    0,      /* unpack only ith value (double) */
-    0,       /* unpack only ith value (float) */
-    0,  /* unpack a given set of elements (double) */
-    0,   /* unpack a given set of elements (float) */
-    0,     /* unpack a subarray */
-    0,                      /* clear */
-    0,                 /* clone accessor */
-};
-
-
-grib_accessor_class* grib_accessor_class_when = &_grib_accessor_class_when;
-
-/* END_CLASS_IMP */
-
-static void init(grib_accessor* a, const long len, grib_arguments* arg)
-{
-    a->length = 0;
-    a->flags |= GRIB_ACCESSOR_FLAG_HIDDEN;
-    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-}
-
-static void dump(grib_accessor* a, grib_dumper* dumper)
-{
-    /* grib_dump_when(dumper,a,NULL); */
-}
-
-static int notify_change(grib_accessor* a, grib_accessor* changed)
-{
-    return grib_action_notify_change(a->creator, a, changed);
-}
-
-static int get_native_type(grib_accessor* a)
-{
-    return GRIB_TYPE_UNDEFINED;
-}
diff --git a/src/eccodes_prototypes.h b/src/eccodes_prototypes.h
index 30fcd82b0..cf7673e19 100644
--- a/src/eccodes_prototypes.h
+++ b/src/eccodes_prototypes.h
@@ -206,13 +206,6 @@ void grib_viarray_delete_content(grib_context* c, grib_viarray* v);
 /* grib_accessor_class_bits_per_value.cc*/
 
 /* grib_accessor_class_bufr_data_array.cc*/
-// ===== TODO(maee): Reenable these functions =====
-//grib_vsarray* accessor_bufr_data_array_get_stringValues(grib_accessor* a);
-//grib_accessors_list* accessor_bufr_data_array_get_dataAccessors(grib_accessor* a);
-//grib_trie_with_rank* accessor_bufr_data_array_get_dataAccessorsTrie(grib_accessor* a);
-//void accessor_bufr_data_array_set_unpackMode(grib_accessor* a, int unpackMode);
-// ===== END =====
-
 
 /* grib_accessor_class_bufr_data_element.cc*/
 void accessor_bufr_data_element_set_index(grib_accessor* a, long index);
diff --git a/src/grib_accessor_class.h b/src/grib_accessor_class.h
index fd0370719..ceda43659 100644
--- a/src/grib_accessor_class.h
+++ b/src/grib_accessor_class.h
@@ -1,216 +1,216 @@
 #include "grib_api_internal.h"
 
-//extern grib_accessor_class* grib_accessor_class_abstract_long_vector;
-//extern grib_accessor_class* grib_accessor_class_abstract_vector;
-//extern grib_accessor_class* grib_accessor_class_ascii;
-//extern grib_accessor_class* grib_accessor_class_bit;
-//extern grib_accessor_class* grib_accessor_class_bitmap;
-//extern grib_accessor_class* grib_accessor_class_bits;
-//extern grib_accessor_class* grib_accessor_class_bits_per_value;
-//extern grib_accessor_class* grib_accessor_class_blob;
-//extern grib_accessor_class* grib_accessor_class_budgdate;
-//extern grib_accessor_class* grib_accessor_class_bufr_data_array;
-//extern grib_accessor_class* grib_accessor_class_bufr_data_element;
-//extern grib_accessor_class* grib_accessor_class_bufr_elements_table;
-//extern grib_accessor_class* grib_accessor_class_bufr_extract_area_subsets;
-//extern grib_accessor_class* grib_accessor_class_bufr_extract_datetime_subsets;
-//extern grib_accessor_class* grib_accessor_class_bufr_extract_subsets;
-//extern grib_accessor_class* grib_accessor_class_bufr_group;
-//extern grib_accessor_class* grib_accessor_class_bufr_simple_thinning;
-//extern grib_accessor_class* grib_accessor_class_bufr_string_values;
-//extern grib_accessor_class* grib_accessor_class_bufrdc_expanded_descriptors;
-//extern grib_accessor_class* grib_accessor_class_bytes;
-//extern grib_accessor_class* grib_accessor_class_change_alternative_row_scanning;
-//extern grib_accessor_class* grib_accessor_class_change_scanning_direction;
-//extern grib_accessor_class* grib_accessor_class_check_internal_version;
-//extern grib_accessor_class* grib_accessor_class_closest_date;
-//extern grib_accessor_class* grib_accessor_class_codeflag;
+extern grib_accessor_class* grib_accessor_class_abstract_long_vector;
+extern grib_accessor_class* grib_accessor_class_abstract_vector;
+extern grib_accessor_class* grib_accessor_class_ascii;
+extern grib_accessor_class* grib_accessor_class_bit;
+extern grib_accessor_class* grib_accessor_class_bitmap;
+extern grib_accessor_class* grib_accessor_class_bits;
+extern grib_accessor_class* grib_accessor_class_bits_per_value;
+extern grib_accessor_class* grib_accessor_class_blob;
+extern grib_accessor_class* grib_accessor_class_budgdate;
+extern grib_accessor_class* grib_accessor_class_bufr_data_array;
+extern grib_accessor_class* grib_accessor_class_bufr_data_element;
+extern grib_accessor_class* grib_accessor_class_bufr_elements_table;
+extern grib_accessor_class* grib_accessor_class_bufr_extract_area_subsets;
+extern grib_accessor_class* grib_accessor_class_bufr_extract_datetime_subsets;
+extern grib_accessor_class* grib_accessor_class_bufr_extract_subsets;
+extern grib_accessor_class* grib_accessor_class_bufr_group;
+extern grib_accessor_class* grib_accessor_class_bufr_simple_thinning;
+extern grib_accessor_class* grib_accessor_class_bufr_string_values;
+extern grib_accessor_class* grib_accessor_class_bufrdc_expanded_descriptors;
+extern grib_accessor_class* grib_accessor_class_bytes;
+extern grib_accessor_class* grib_accessor_class_change_alternative_row_scanning;
+extern grib_accessor_class* grib_accessor_class_change_scanning_direction;
+extern grib_accessor_class* grib_accessor_class_check_internal_version;
+extern grib_accessor_class* grib_accessor_class_closest_date;
+extern grib_accessor_class* grib_accessor_class_codeflag;
 #include "accessor/grib_accessor_class_codetable.h"
 extern grib_accessor_class* grib_accessor_class_codetable;
-//extern grib_accessor_class* grib_accessor_class_codetable_title;
-//extern grib_accessor_class* grib_accessor_class_codetable_units;
-//extern grib_accessor_class* grib_accessor_class_concept;
+extern grib_accessor_class* grib_accessor_class_codetable_title;
+extern grib_accessor_class* grib_accessor_class_codetable_units;
+extern grib_accessor_class* grib_accessor_class_concept;
 #include "accessor/grib_accessor_class_constant.h"
 extern grib_accessor_class* grib_accessor_class_constant;
-//extern grib_accessor_class* grib_accessor_class_count_file;
-//extern grib_accessor_class* grib_accessor_class_count_missing;
-//extern grib_accessor_class* grib_accessor_class_count_total;
-//extern grib_accessor_class* grib_accessor_class_data_apply_bitmap;
-//extern grib_accessor_class* grib_accessor_class_data_apply_boustrophedonic;
-//extern grib_accessor_class* grib_accessor_class_data_apply_boustrophedonic_bitmap;
-//extern grib_accessor_class* grib_accessor_class_data_ccsds_packing;
-//extern grib_accessor_class* grib_accessor_class_data_complex_packing;
-//extern grib_accessor_class* grib_accessor_class_data_dummy_field;
-//extern grib_accessor_class* grib_accessor_class_data_g1complex_packing;
-//extern grib_accessor_class* grib_accessor_class_data_g1second_order_constant_width_packing;
-//extern grib_accessor_class* grib_accessor_class_data_g1second_order_general_extended_packing;
-//extern grib_accessor_class* grib_accessor_class_data_g1second_order_general_packing;
-//extern grib_accessor_class* grib_accessor_class_data_g1second_order_row_by_row_packing;
-//extern grib_accessor_class* grib_accessor_class_data_g1secondary_bitmap;
-//extern grib_accessor_class* grib_accessor_class_data_g1shsimple_packing;
-//extern grib_accessor_class* grib_accessor_class_data_g1simple_packing;
-//extern grib_accessor_class* grib_accessor_class_data_g22order_packing;
-//extern grib_accessor_class* grib_accessor_class_data_g2bifourier_packing;
-//extern grib_accessor_class* grib_accessor_class_data_g2complex_packing;
-//extern grib_accessor_class* grib_accessor_class_data_g2secondary_bitmap;
-//extern grib_accessor_class* grib_accessor_class_data_g2shsimple_packing;
-//extern grib_accessor_class* grib_accessor_class_data_g2simple_packing;
-//extern grib_accessor_class* grib_accessor_class_data_g2simple_packing_with_preprocessing;
-//extern grib_accessor_class* grib_accessor_class_data_jpeg2000_packing;
-//extern grib_accessor_class* grib_accessor_class_data_png_packing;
-//extern grib_accessor_class* grib_accessor_class_data_raw_packing;
-//extern grib_accessor_class* grib_accessor_class_data_run_length_packing;
-//extern grib_accessor_class* grib_accessor_class_data_secondary_bitmap;
-//extern grib_accessor_class* grib_accessor_class_data_sh_packed;
-//extern grib_accessor_class* grib_accessor_class_data_sh_unpacked;
-//extern grib_accessor_class* grib_accessor_class_data_shsimple_packing;
-//extern grib_accessor_class* grib_accessor_class_data_simple_packing;
-//extern grib_accessor_class* grib_accessor_class_decimal_precision;
-//extern grib_accessor_class* grib_accessor_class_dictionary;
-//extern grib_accessor_class* grib_accessor_class_dirty;
-//extern grib_accessor_class* grib_accessor_class_divdouble;
-//extern grib_accessor_class* grib_accessor_class_double;
-//extern grib_accessor_class* grib_accessor_class_element;
-//extern grib_accessor_class* grib_accessor_class_evaluate;
-//extern grib_accessor_class* grib_accessor_class_expanded_descriptors;
-//extern grib_accessor_class* grib_accessor_class_from_scale_factor_scaled_value;
-//extern grib_accessor_class* grib_accessor_class_g1_half_byte_codeflag;
-//extern grib_accessor_class* grib_accessor_class_g1_message_length;
-//extern grib_accessor_class* grib_accessor_class_g1_section4_length;
-//extern grib_accessor_class* grib_accessor_class_g1bitmap;
-//extern grib_accessor_class* grib_accessor_class_g1date;
-//extern grib_accessor_class* grib_accessor_class_g1day_of_the_year_date;
-//extern grib_accessor_class* grib_accessor_class_g1end_of_interval_monthly;
-//extern grib_accessor_class* grib_accessor_class_g1fcperiod;
-//extern grib_accessor_class* grib_accessor_class_g1forecastmonth;
-//extern grib_accessor_class* grib_accessor_class_g1monthlydate;
-//extern grib_accessor_class* grib_accessor_class_g1number_of_coded_values_sh_complex;
-//extern grib_accessor_class* grib_accessor_class_g1number_of_coded_values_sh_simple;
-//extern grib_accessor_class* grib_accessor_class_g1step_range;
-//extern grib_accessor_class* grib_accessor_class_g1verificationdate;
-//extern grib_accessor_class* grib_accessor_class_g2_aerosol;
-//extern grib_accessor_class* grib_accessor_class_g2_chemical;
-//extern grib_accessor_class* grib_accessor_class_g2_eps;
-//extern grib_accessor_class* grib_accessor_class_g2_mars_labeling;
-//extern grib_accessor_class* grib_accessor_class_g2bitmap;
-//extern grib_accessor_class* grib_accessor_class_g2bitmap_present;
-//extern grib_accessor_class* grib_accessor_class_g2date;
-//extern grib_accessor_class* grib_accessor_class_g2end_step;
-//extern grib_accessor_class* grib_accessor_class_g2grid;
-//extern grib_accessor_class* grib_accessor_class_g2latlon;
-//extern grib_accessor_class* grib_accessor_class_g2level;
-//extern grib_accessor_class* grib_accessor_class_g2lon;
-//extern grib_accessor_class* grib_accessor_class_g2step_range;
-//extern grib_accessor_class* grib_accessor_class_gaussian_grid_name;
-//extern grib_accessor_class* grib_accessor_class_gds_is_present;
-//extern grib_accessor_class* grib_accessor_class_gds_not_present_bitmap;
-//extern grib_accessor_class* grib_accessor_class_gen;
-//extern grib_accessor_class* grib_accessor_class_getenv;
-//extern grib_accessor_class* grib_accessor_class_global_gaussian;
-//extern grib_accessor_class* grib_accessor_class_group;
-//extern grib_accessor_class* grib_accessor_class_group_copy;
-//extern grib_accessor_class* grib_accessor_class_gts_header;
-//extern grib_accessor_class* grib_accessor_class_hash_array;
-//extern grib_accessor_class* grib_accessor_class_headers_only;
-//extern grib_accessor_class* grib_accessor_class_ibmfloat;
-//extern grib_accessor_class* grib_accessor_class_ieeefloat;
-//extern grib_accessor_class* grib_accessor_class_ifs_param;
+extern grib_accessor_class* grib_accessor_class_count_file;
+extern grib_accessor_class* grib_accessor_class_count_missing;
+extern grib_accessor_class* grib_accessor_class_count_total;
+extern grib_accessor_class* grib_accessor_class_data_apply_bitmap;
+extern grib_accessor_class* grib_accessor_class_data_apply_boustrophedonic;
+extern grib_accessor_class* grib_accessor_class_data_apply_boustrophedonic_bitmap;
+extern grib_accessor_class* grib_accessor_class_data_ccsds_packing;
+extern grib_accessor_class* grib_accessor_class_data_complex_packing;
+extern grib_accessor_class* grib_accessor_class_data_dummy_field;
+extern grib_accessor_class* grib_accessor_class_data_g1complex_packing;
+extern grib_accessor_class* grib_accessor_class_data_g1second_order_constant_width_packing;
+extern grib_accessor_class* grib_accessor_class_data_g1second_order_general_extended_packing;
+extern grib_accessor_class* grib_accessor_class_data_g1second_order_general_packing;
+extern grib_accessor_class* grib_accessor_class_data_g1second_order_row_by_row_packing;
+extern grib_accessor_class* grib_accessor_class_data_g1secondary_bitmap;
+extern grib_accessor_class* grib_accessor_class_data_g1shsimple_packing;
+extern grib_accessor_class* grib_accessor_class_data_g1simple_packing;
+extern grib_accessor_class* grib_accessor_class_data_g22order_packing;
+extern grib_accessor_class* grib_accessor_class_data_g2bifourier_packing;
+extern grib_accessor_class* grib_accessor_class_data_g2complex_packing;
+extern grib_accessor_class* grib_accessor_class_data_g2secondary_bitmap;
+extern grib_accessor_class* grib_accessor_class_data_g2shsimple_packing;
+extern grib_accessor_class* grib_accessor_class_data_g2simple_packing;
+extern grib_accessor_class* grib_accessor_class_data_g2simple_packing_with_preprocessing;
+extern grib_accessor_class* grib_accessor_class_data_jpeg2000_packing;
+extern grib_accessor_class* grib_accessor_class_data_png_packing;
+extern grib_accessor_class* grib_accessor_class_data_raw_packing;
+extern grib_accessor_class* grib_accessor_class_data_run_length_packing;
+extern grib_accessor_class* grib_accessor_class_data_secondary_bitmap;
+extern grib_accessor_class* grib_accessor_class_data_sh_packed;
+extern grib_accessor_class* grib_accessor_class_data_sh_unpacked;
+extern grib_accessor_class* grib_accessor_class_data_shsimple_packing;
+extern grib_accessor_class* grib_accessor_class_data_simple_packing;
+extern grib_accessor_class* grib_accessor_class_decimal_precision;
+extern grib_accessor_class* grib_accessor_class_dictionary;
+extern grib_accessor_class* grib_accessor_class_dirty;
+extern grib_accessor_class* grib_accessor_class_divdouble;
+extern grib_accessor_class* grib_accessor_class_double;
+extern grib_accessor_class* grib_accessor_class_element;
+extern grib_accessor_class* grib_accessor_class_evaluate;
+extern grib_accessor_class* grib_accessor_class_expanded_descriptors;
+extern grib_accessor_class* grib_accessor_class_from_scale_factor_scaled_value;
+extern grib_accessor_class* grib_accessor_class_g1_half_byte_codeflag;
+extern grib_accessor_class* grib_accessor_class_g1_message_length;
+extern grib_accessor_class* grib_accessor_class_g1_section4_length;
+extern grib_accessor_class* grib_accessor_class_g1bitmap;
+extern grib_accessor_class* grib_accessor_class_g1date;
+extern grib_accessor_class* grib_accessor_class_g1day_of_the_year_date;
+extern grib_accessor_class* grib_accessor_class_g1end_of_interval_monthly;
+extern grib_accessor_class* grib_accessor_class_g1fcperiod;
+extern grib_accessor_class* grib_accessor_class_g1forecastmonth;
+extern grib_accessor_class* grib_accessor_class_g1monthlydate;
+extern grib_accessor_class* grib_accessor_class_g1number_of_coded_values_sh_complex;
+extern grib_accessor_class* grib_accessor_class_g1number_of_coded_values_sh_simple;
+extern grib_accessor_class* grib_accessor_class_g1step_range;
+extern grib_accessor_class* grib_accessor_class_g1verificationdate;
+extern grib_accessor_class* grib_accessor_class_g2_aerosol;
+extern grib_accessor_class* grib_accessor_class_g2_chemical;
+extern grib_accessor_class* grib_accessor_class_g2_eps;
+extern grib_accessor_class* grib_accessor_class_g2_mars_labeling;
+extern grib_accessor_class* grib_accessor_class_g2bitmap;
+extern grib_accessor_class* grib_accessor_class_g2bitmap_present;
+extern grib_accessor_class* grib_accessor_class_g2date;
+extern grib_accessor_class* grib_accessor_class_g2end_step;
+extern grib_accessor_class* grib_accessor_class_g2grid;
+extern grib_accessor_class* grib_accessor_class_g2latlon;
+extern grib_accessor_class* grib_accessor_class_g2level;
+extern grib_accessor_class* grib_accessor_class_g2lon;
+extern grib_accessor_class* grib_accessor_class_g2step_range;
+extern grib_accessor_class* grib_accessor_class_gaussian_grid_name;
+extern grib_accessor_class* grib_accessor_class_gds_is_present;
+extern grib_accessor_class* grib_accessor_class_gds_not_present_bitmap;
+extern grib_accessor_class* grib_accessor_class_gen;
+extern grib_accessor_class* grib_accessor_class_getenv;
+extern grib_accessor_class* grib_accessor_class_global_gaussian;
+extern grib_accessor_class* grib_accessor_class_group;
+extern grib_accessor_class* grib_accessor_class_group_copy;
+extern grib_accessor_class* grib_accessor_class_gts_header;
+extern grib_accessor_class* grib_accessor_class_hash_array;
+extern grib_accessor_class* grib_accessor_class_headers_only;
+extern grib_accessor_class* grib_accessor_class_ibmfloat;
+extern grib_accessor_class* grib_accessor_class_ieeefloat;
+extern grib_accessor_class* grib_accessor_class_ifs_param;
 #include "accessor/grib_accessor_class_iterator.h"
 extern grib_accessor_class* grib_accessor_class_iterator;
-//extern grib_accessor_class* grib_accessor_class_julian_date;
-//extern grib_accessor_class* grib_accessor_class_julian_day;
-//extern grib_accessor_class* grib_accessor_class_ksec1expver;
-//extern grib_accessor_class* grib_accessor_class_label;
-//extern grib_accessor_class* grib_accessor_class_latitudes;
-//extern grib_accessor_class* grib_accessor_class_latlon_increment;
-//extern grib_accessor_class* grib_accessor_class_latlonvalues;
-//extern grib_accessor_class* grib_accessor_class_library_version;
-//extern grib_accessor_class* grib_accessor_class_local_definition;
+extern grib_accessor_class* grib_accessor_class_julian_date;
+extern grib_accessor_class* grib_accessor_class_julian_day;
+extern grib_accessor_class* grib_accessor_class_ksec1expver;
+extern grib_accessor_class* grib_accessor_class_label;
+extern grib_accessor_class* grib_accessor_class_latitudes;
+extern grib_accessor_class* grib_accessor_class_latlon_increment;
+extern grib_accessor_class* grib_accessor_class_latlonvalues;
+extern grib_accessor_class* grib_accessor_class_library_version;
+extern grib_accessor_class* grib_accessor_class_local_definition;
 #include "accessor/grib_accessor_class_long.h"
 extern grib_accessor_class* grib_accessor_class_long;
-//extern grib_accessor_class* grib_accessor_class_long_vector;
-//extern grib_accessor_class* grib_accessor_class_longitudes;
-//extern grib_accessor_class* grib_accessor_class_lookup;
-//extern grib_accessor_class* grib_accessor_class_mars_param;
-//extern grib_accessor_class* grib_accessor_class_mars_step;
-//extern grib_accessor_class* grib_accessor_class_md5;
-//extern grib_accessor_class* grib_accessor_class_message;
-//extern grib_accessor_class* grib_accessor_class_message_copy;
-//extern grib_accessor_class* grib_accessor_class_multdouble;
+extern grib_accessor_class* grib_accessor_class_long_vector;
+extern grib_accessor_class* grib_accessor_class_longitudes;
+extern grib_accessor_class* grib_accessor_class_lookup;
+extern grib_accessor_class* grib_accessor_class_mars_param;
+extern grib_accessor_class* grib_accessor_class_mars_step;
+extern grib_accessor_class* grib_accessor_class_md5;
+extern grib_accessor_class* grib_accessor_class_message;
+extern grib_accessor_class* grib_accessor_class_message_copy;
+extern grib_accessor_class* grib_accessor_class_multdouble;
 #include "accessor/grib_accessor_class_nearest.h"
 extern grib_accessor_class* grib_accessor_class_nearest;
-//extern grib_accessor_class* grib_accessor_class_non_alpha;
-//extern grib_accessor_class* grib_accessor_class_number_of_coded_values;
-//extern grib_accessor_class* grib_accessor_class_number_of_points;
-//extern grib_accessor_class* grib_accessor_class_number_of_points_gaussian;
-//extern grib_accessor_class* grib_accessor_class_number_of_values;
-//extern grib_accessor_class* grib_accessor_class_number_of_values_data_raw_packing;
-//extern grib_accessor_class* grib_accessor_class_octahedral_gaussian;
-//extern grib_accessor_class* grib_accessor_class_octet_number;
-//extern grib_accessor_class* grib_accessor_class_offset_file;
-//extern grib_accessor_class* grib_accessor_class_offset_values;
-//extern grib_accessor_class* grib_accessor_class_optimal_step_units;
-//extern grib_accessor_class* grib_accessor_class_pack_bufr_values;
-//extern grib_accessor_class* grib_accessor_class_packing_type;
-//extern grib_accessor_class* grib_accessor_class_pad;
-//extern grib_accessor_class* grib_accessor_class_padding;
-//extern grib_accessor_class* grib_accessor_class_padto;
-//extern grib_accessor_class* grib_accessor_class_padtoeven;
-//extern grib_accessor_class* grib_accessor_class_padtomultiple;
-//extern grib_accessor_class* grib_accessor_class_position;
-//extern grib_accessor_class* grib_accessor_class_proj_string;
-//extern grib_accessor_class* grib_accessor_class_raw;
-//extern grib_accessor_class* grib_accessor_class_rdbtime_guess_date;
-//extern grib_accessor_class* grib_accessor_class_reference_value_error;
-//extern grib_accessor_class* grib_accessor_class_round;
-//extern grib_accessor_class* grib_accessor_class_scale;
-//extern grib_accessor_class* grib_accessor_class_scale_values;
-//extern grib_accessor_class* grib_accessor_class_second_order_bits_per_value;
-//extern grib_accessor_class* grib_accessor_class_section;
-//extern grib_accessor_class* grib_accessor_class_section_length;
-//extern grib_accessor_class* grib_accessor_class_section_padding;
-//extern grib_accessor_class* grib_accessor_class_section_pointer;
-//extern grib_accessor_class* grib_accessor_class_select_step_template;
-//extern grib_accessor_class* grib_accessor_class_sexagesimal2decimal;
-//extern grib_accessor_class* grib_accessor_class_signed;
-//extern grib_accessor_class* grib_accessor_class_signed_bits;
-//extern grib_accessor_class* grib_accessor_class_simple_packing_error;
-//extern grib_accessor_class* grib_accessor_class_size;
+extern grib_accessor_class* grib_accessor_class_non_alpha;
+extern grib_accessor_class* grib_accessor_class_number_of_coded_values;
+extern grib_accessor_class* grib_accessor_class_number_of_points;
+extern grib_accessor_class* grib_accessor_class_number_of_points_gaussian;
+extern grib_accessor_class* grib_accessor_class_number_of_values;
+extern grib_accessor_class* grib_accessor_class_number_of_values_data_raw_packing;
+extern grib_accessor_class* grib_accessor_class_octahedral_gaussian;
+extern grib_accessor_class* grib_accessor_class_octet_number;
+extern grib_accessor_class* grib_accessor_class_offset_file;
+extern grib_accessor_class* grib_accessor_class_offset_values;
+extern grib_accessor_class* grib_accessor_class_optimal_step_units;
+extern grib_accessor_class* grib_accessor_class_pack_bufr_values;
+extern grib_accessor_class* grib_accessor_class_packing_type;
+extern grib_accessor_class* grib_accessor_class_pad;
+extern grib_accessor_class* grib_accessor_class_padding;
+extern grib_accessor_class* grib_accessor_class_padto;
+extern grib_accessor_class* grib_accessor_class_padtoeven;
+extern grib_accessor_class* grib_accessor_class_padtomultiple;
+extern grib_accessor_class* grib_accessor_class_position;
+extern grib_accessor_class* grib_accessor_class_proj_string;
+extern grib_accessor_class* grib_accessor_class_raw;
+extern grib_accessor_class* grib_accessor_class_rdbtime_guess_date;
+extern grib_accessor_class* grib_accessor_class_reference_value_error;
+extern grib_accessor_class* grib_accessor_class_round;
+extern grib_accessor_class* grib_accessor_class_scale;
+extern grib_accessor_class* grib_accessor_class_scale_values;
+extern grib_accessor_class* grib_accessor_class_second_order_bits_per_value;
+extern grib_accessor_class* grib_accessor_class_section;
+extern grib_accessor_class* grib_accessor_class_section_length;
+extern grib_accessor_class* grib_accessor_class_section_padding;
+extern grib_accessor_class* grib_accessor_class_section_pointer;
+extern grib_accessor_class* grib_accessor_class_select_step_template;
+extern grib_accessor_class* grib_accessor_class_sexagesimal2decimal;
+extern grib_accessor_class* grib_accessor_class_signed;
+extern grib_accessor_class* grib_accessor_class_signed_bits;
+extern grib_accessor_class* grib_accessor_class_simple_packing_error;
+extern grib_accessor_class* grib_accessor_class_size;
 #include "accessor/grib_accessor_class_smart_table.h"
 extern grib_accessor_class* grib_accessor_class_smart_table;
-//extern grib_accessor_class* grib_accessor_class_smart_table_column;
-//extern grib_accessor_class* grib_accessor_class_spd;
-//extern grib_accessor_class* grib_accessor_class_spectral_truncation;
-//extern grib_accessor_class* grib_accessor_class_sprintf;
-//extern grib_accessor_class* grib_accessor_class_statistics;
-//extern grib_accessor_class* grib_accessor_class_statistics_spectral;
-//extern grib_accessor_class* grib_accessor_class_step_human_readable;
-//extern grib_accessor_class* grib_accessor_class_step_in_units;
-//extern grib_accessor_class* grib_accessor_class_sum;
-//extern grib_accessor_class* grib_accessor_class_suppressed;
-//extern grib_accessor_class* grib_accessor_class_time;
-//extern grib_accessor_class* grib_accessor_class_to_double;
-//extern grib_accessor_class* grib_accessor_class_to_integer;
-//extern grib_accessor_class* grib_accessor_class_to_string;
+extern grib_accessor_class* grib_accessor_class_smart_table_column;
+extern grib_accessor_class* grib_accessor_class_spd;
+extern grib_accessor_class* grib_accessor_class_spectral_truncation;
+extern grib_accessor_class* grib_accessor_class_sprintf;
+extern grib_accessor_class* grib_accessor_class_statistics;
+extern grib_accessor_class* grib_accessor_class_statistics_spectral;
+extern grib_accessor_class* grib_accessor_class_step_human_readable;
+extern grib_accessor_class* grib_accessor_class_step_in_units;
+extern grib_accessor_class* grib_accessor_class_sum;
+extern grib_accessor_class* grib_accessor_class_suppressed;
+extern grib_accessor_class* grib_accessor_class_time;
+extern grib_accessor_class* grib_accessor_class_to_double;
+extern grib_accessor_class* grib_accessor_class_to_integer;
+extern grib_accessor_class* grib_accessor_class_to_string;
 #include "accessor/grib_accessor_class_transient.h"
 extern grib_accessor_class* grib_accessor_class_transient;
-//extern grib_accessor_class* grib_accessor_class_transient_darray;
-//extern grib_accessor_class* grib_accessor_class_trim;
-//extern grib_accessor_class* grib_accessor_class_uint16;
-//extern grib_accessor_class* grib_accessor_class_uint32;
-//extern grib_accessor_class* grib_accessor_class_uint32_little_endian;
-//extern grib_accessor_class* grib_accessor_class_uint64;
-//extern grib_accessor_class* grib_accessor_class_uint64_little_endian;
-//extern grib_accessor_class* grib_accessor_class_uint8;
-//extern grib_accessor_class* grib_accessor_class_unexpanded_descriptors;
-//extern grib_accessor_class* grib_accessor_class_unpack_bufr_values;
+extern grib_accessor_class* grib_accessor_class_transient_darray;
+extern grib_accessor_class* grib_accessor_class_trim;
+extern grib_accessor_class* grib_accessor_class_uint16;
+extern grib_accessor_class* grib_accessor_class_uint32;
+extern grib_accessor_class* grib_accessor_class_uint32_little_endian;
+extern grib_accessor_class* grib_accessor_class_uint64;
+extern grib_accessor_class* grib_accessor_class_uint64_little_endian;
+extern grib_accessor_class* grib_accessor_class_uint8;
+extern grib_accessor_class* grib_accessor_class_unexpanded_descriptors;
+extern grib_accessor_class* grib_accessor_class_unpack_bufr_values;
 #include "accessor/grib_accessor_class_unsigned.h"
 extern grib_accessor_class* grib_accessor_class_unsigned;
-//extern grib_accessor_class* grib_accessor_class_unsigned_bits;
-//extern grib_accessor_class* grib_accessor_class_validity_date;
-//extern grib_accessor_class* grib_accessor_class_validity_time;
-//extern grib_accessor_class* grib_accessor_class_values;
+extern grib_accessor_class* grib_accessor_class_unsigned_bits;
+extern grib_accessor_class* grib_accessor_class_validity_date;
+extern grib_accessor_class* grib_accessor_class_validity_time;
+extern grib_accessor_class* grib_accessor_class_values;
 #include "accessor/grib_accessor_class_variable.h"
 extern grib_accessor_class* grib_accessor_class_variable;
-//extern grib_accessor_class* grib_accessor_class_vector;
-//extern grib_accessor_class* grib_accessor_class_when;
+extern grib_accessor_class* grib_accessor_class_vector;
+extern grib_accessor_class* grib_accessor_class_when;
diff --git a/src/grib_accessor_classes_hash.cc b/src/grib_accessor_classes_hash.cc
index dd88339f7..178ed937b 100644
--- a/src/grib_accessor_classes_hash.cc
+++ b/src/grib_accessor_classes_hash.cc
@@ -1,6 +1,6 @@
 /* ANSI-C code produced by gperf version 3.1 */
 /* Command-line: gperf -C -W classes -t -G -H grib_accessor_classes_get_id -N grib_accessor_classes_hash -m 1 -j 1 accessor_class_list.gperf  */
-/* Computed positions: -k'1' */
+/* Computed positions: -k'1-2,5,7,11' */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -37,12 +37,12 @@
 #line 6 "accessor_class_list.gperf"
 struct accessor_class_hash { const char *name; grib_accessor_class **cclass;};
 
-#define TOTAL_KEYWORDS 10
+#define TOTAL_KEYWORDS 205
 #define MIN_WORD_LENGTH 1
-#define MAX_WORD_LENGTH 11
+#define MAX_WORD_LENGTH 44
 #define MIN_HASH_VALUE 1
-#define MAX_HASH_VALUE 14
-/* maximum key range = 14, duplicates = 0 */
+#define MAX_HASH_VALUE 506
+/* maximum key range = 506, duplicates = 0 */
 
 #ifdef __GNUC__
 
@@ -54,36 +54,62 @@ struct accessor_class_hash { const char *name; grib_accessor_class **cclass;};
 static unsigned int
 grib_accessor_classes_get_id (const char *str, size_t len)
 {
-  static const unsigned char asso_values[] =
+  static const unsigned short asso_values[] =
     {
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15,  0, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15,  1,
-      15, 15, 15, 15, 15,  6, 15, 15,  0, 15,
-       0, 15, 15, 15, 15,  2,  3,  3,  0, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15
+      507, 507, 507, 507, 507, 507, 507, 507, 507, 507,
+      507, 507, 507, 507, 507, 507, 507, 507, 507, 507,
+      507, 507, 507, 507, 507, 507, 507, 507, 507, 507,
+      507, 507,   0, 507, 507, 507, 507, 507, 507, 507,
+      507, 507, 507, 507, 507, 507, 507, 507,   1, 145,
+       23,   6,   2, 507,   4, 507,   1, 507, 507, 507,
+      507, 507, 507, 507, 507, 507, 507, 507, 507, 507,
+      507, 507, 507, 507, 507, 507, 507, 507, 507, 507,
+      507, 507, 507, 507, 507, 507, 507, 507, 507, 507,
+      507, 507, 507, 507, 507,   0, 507,   0,  69,  84,
+        0,   0, 161,  24, 187,   1,   8,   9,  87, 102,
+       13,  51,   6, 507, 118,   1,  40,  59, 171,   0,
+        4,   6, 507, 507, 507, 507, 507, 507, 507, 507,
+      507, 507, 507, 507, 507, 507, 507, 507, 507, 507,
+      507, 507, 507, 507, 507, 507, 507, 507, 507, 507,
+      507, 507, 507, 507, 507, 507, 507, 507, 507, 507,
+      507, 507, 507, 507, 507, 507, 507, 507, 507, 507,
+      507, 507, 507, 507, 507, 507, 507, 507, 507, 507,
+      507, 507, 507, 507, 507, 507, 507, 507, 507, 507,
+      507, 507, 507, 507, 507, 507, 507, 507, 507, 507,
+      507, 507, 507, 507, 507, 507, 507, 507, 507, 507,
+      507, 507, 507, 507, 507, 507, 507, 507, 507, 507,
+      507, 507, 507, 507, 507, 507, 507, 507, 507, 507,
+      507, 507, 507, 507, 507, 507, 507, 507, 507, 507,
+      507, 507, 507, 507, 507, 507, 507, 507, 507, 507,
+      507, 507, 507, 507, 507, 507
     };
-  return len + asso_values[(unsigned char)str[0]];
+  unsigned int hval = len;
+
+  switch (hval)
+    {
+      default:
+        hval += asso_values[(unsigned char)str[10]];
+      /*FALLTHROUGH*/
+      case 10:
+      case 9:
+      case 8:
+      case 7:
+        hval += asso_values[(unsigned char)str[6]];
+      /*FALLTHROUGH*/
+      case 6:
+      case 5:
+        hval += asso_values[(unsigned char)str[4]];
+      /*FALLTHROUGH*/
+      case 4:
+      case 3:
+      case 2:
+        hval += asso_values[(unsigned char)str[1]];
+      /*FALLTHROUGH*/
+      case 1:
+        hval += asso_values[(unsigned char)str[0]];
+        break;
+    }
+  return hval;
 }
 
 static const struct accessor_class_hash classes[] =
@@ -91,26 +117,509 @@ static const struct accessor_class_hash classes[] =
     {""},
 #line 9 "accessor_class_list.gperf"
     {" "},
+    {""}, {""}, {""}, {""},
+#line 179 "accessor_class_list.gperf"
+    {"size", &grib_accessor_class_size},
+#line 12 "accessor_class_list.gperf"
+    {"ascii", &grib_accessor_class_ascii},
+#line 176 "accessor_class_list.gperf"
+    {"signed", &grib_accessor_class_signed},
+#line 156 "accessor_class_list.gperf"
+    {"pad", &grib_accessor_class_pad},
+#line 182 "accessor_class_list.gperf"
+    {"spd", &grib_accessor_class_spd},
+    {""},
+#line 75 "accessor_class_list.gperf"
+    {"dirty", &grib_accessor_class_dirty},
+    {""},
+#line 177 "accessor_class_list.gperf"
+    {"signed_bits", &grib_accessor_class_signed_bits},
+    {""},
+#line 66 "accessor_class_list.gperf"
+    {"data_raw_packing", &grib_accessor_class_data_raw_packing},
+    {""}, {""}, {""},
+#line 72 "accessor_class_list.gperf"
+    {"data_simple_packing", &grib_accessor_class_data_simple_packing},
+#line 68 "accessor_class_list.gperf"
+    {"data_secondary_bitmap", &grib_accessor_class_data_secondary_bitmap},
+#line 170 "accessor_class_list.gperf"
+    {"section", &grib_accessor_class_section},
+#line 43 "accessor_class_list.gperf"
+    {"data_apply_bitmap", &grib_accessor_class_data_apply_bitmap},
+    {""},
+#line 74 "accessor_class_list.gperf"
+    {"dictionary", &grib_accessor_class_dictionary},
+    {""},
+#line 112 "accessor_class_list.gperf"
+    {"gen", &grib_accessor_class_gen},
+#line 64 "accessor_class_list.gperf"
+    {"data_jpeg2000_packing", &grib_accessor_class_data_jpeg2000_packing},
+#line 65 "accessor_class_list.gperf"
+    {"data_png_packing", &grib_accessor_class_data_png_packing},
+#line 172 "accessor_class_list.gperf"
+    {"section_padding", &grib_accessor_class_section_padding},
+#line 173 "accessor_class_list.gperf"
+    {"section_pointer", &grib_accessor_class_section_pointer},
+#line 44 "accessor_class_list.gperf"
+    {"data_apply_boustrophedonic", &grib_accessor_class_data_apply_boustrophedonic},
+    {""}, {""}, {""}, {""},
+#line 80 "accessor_class_list.gperf"
+    {"expanded_descriptors", &grib_accessor_class_expanded_descriptors},
+#line 157 "accessor_class_list.gperf"
+    {"padding", &grib_accessor_class_padding},
+#line 45 "accessor_class_list.gperf"
+    {"data_apply_boustrophedonic_bitmap", &grib_accessor_class_data_apply_boustrophedonic_bitmap},
+#line 110 "accessor_class_list.gperf"
+    {"gds_is_present", &grib_accessor_class_gds_is_present},
+#line 169 "accessor_class_list.gperf"
+    {"second_order_bits_per_value", &grib_accessor_class_second_order_bits_per_value},
+#line 171 "accessor_class_list.gperf"
+    {"section_length", &grib_accessor_class_section_length},
+#line 113 "accessor_class_list.gperf"
+    {"getenv", &grib_accessor_class_getenv},
+#line 57 "accessor_class_list.gperf"
+    {"data_g22order_packing", &grib_accessor_class_data_g22order_packing},
+#line 191 "accessor_class_list.gperf"
+    {"time", &grib_accessor_class_time},
+    {""},
+#line 61 "accessor_class_list.gperf"
+    {"data_g2shsimple_packing", &grib_accessor_class_data_g2shsimple_packing},
+    {""},
+#line 155 "accessor_class_list.gperf"
+    {"packing_type", &grib_accessor_class_packing_type},
+#line 62 "accessor_class_list.gperf"
+    {"data_g2simple_packing", &grib_accessor_class_data_g2simple_packing},
+#line 59 "accessor_class_list.gperf"
+    {"data_g2complex_packing", &grib_accessor_class_data_g2complex_packing},
     {""}, {""},
-#line 132 "accessor_class_list.gperf"
-    {"long", &grib_accessor_class_long},
-    {""}, {""},
+#line 104 "accessor_class_list.gperf"
+    {"g2grid", &grib_accessor_class_g2grid},
+    {""}, {""}, {""},
+#line 103 "accessor_class_list.gperf"
+    {"g2end_step", &grib_accessor_class_g2end_step},
+#line 98 "accessor_class_list.gperf"
+    {"g2_eps", &grib_accessor_class_g2_eps},
 #line 142 "accessor_class_list.gperf"
     {"nearest", &grib_accessor_class_nearest},
-#line 211 "accessor_class_list.gperf"
-    {"variable", &grib_accessor_class_variable},
-#line 39 "accessor_class_list.gperf"
-    {"constant", &grib_accessor_class_constant},
-#line 35 "accessor_class_list.gperf"
-    {"codetable", &grib_accessor_class_codetable},
+    {""},
+#line 158 "accessor_class_list.gperf"
+    {"padto", &grib_accessor_class_padto},
+#line 189 "accessor_class_list.gperf"
+    {"sum", &grib_accessor_class_sum},
+    {""},
+#line 107 "accessor_class_list.gperf"
+    {"g2lon", &grib_accessor_class_g2lon},
+#line 203 "accessor_class_list.gperf"
+    {"uint8", &grib_accessor_class_uint8},
+    {""},
+#line 188 "accessor_class_list.gperf"
+    {"step_in_units", &grib_accessor_class_step_in_units},
+#line 63 "accessor_class_list.gperf"
+    {"data_g2simple_packing_with_preprocessing", &grib_accessor_class_data_g2simple_packing_with_preprocessing},
+#line 201 "accessor_class_list.gperf"
+    {"uint64", &grib_accessor_class_uint64},
+#line 47 "accessor_class_list.gperf"
+    {"data_complex_packing", &grib_accessor_class_data_complex_packing},
+#line 199 "accessor_class_list.gperf"
+    {"uint32", &grib_accessor_class_uint32},
+#line 13 "accessor_class_list.gperf"
+    {"bit", &grib_accessor_class_bit},
+#line 15 "accessor_class_list.gperf"
+    {"bits", &grib_accessor_class_bits},
+#line 48 "accessor_class_list.gperf"
+    {"data_dummy_field", &grib_accessor_class_data_dummy_field},
+#line 14 "accessor_class_list.gperf"
+    {"bitmap", &grib_accessor_class_bitmap},
+#line 124 "accessor_class_list.gperf"
+    {"julian_day", &grib_accessor_class_julian_day},
+#line 123 "accessor_class_list.gperf"
+    {"julian_date", &grib_accessor_class_julian_date},
+#line 143 "accessor_class_list.gperf"
+    {"non_alpha", &grib_accessor_class_non_alpha},
+    {""},
+#line 29 "accessor_class_list.gperf"
+    {"bytes", &grib_accessor_class_bytes},
+#line 67 "accessor_class_list.gperf"
+    {"data_run_length_packing", &grib_accessor_class_data_run_length_packing},
+#line 108 "accessor_class_list.gperf"
+    {"g2step_range", &grib_accessor_class_g2step_range},
+#line 16 "accessor_class_list.gperf"
+    {"bits_per_value", &grib_accessor_class_bits_per_value},
+    {""}, {""}, {""}, {""}, {""},
+#line 167 "accessor_class_list.gperf"
+    {"scale", &grib_accessor_class_scale},
+    {""},
+#line 185 "accessor_class_list.gperf"
+    {"statistics", &grib_accessor_class_statistics},
+#line 102 "accessor_class_list.gperf"
+    {"g2date", &grib_accessor_class_g2date},
+#line 145 "accessor_class_list.gperf"
+    {"number_of_points", &grib_accessor_class_number_of_points},
+#line 100 "accessor_class_list.gperf"
+    {"g2bitmap", &grib_accessor_class_g2bitmap},
+    {""},
+#line 60 "accessor_class_list.gperf"
+    {"data_g2secondary_bitmap", &grib_accessor_class_data_g2secondary_bitmap},
+#line 58 "accessor_class_list.gperf"
+    {"data_g2bifourier_packing", &grib_accessor_class_data_g2bifourier_packing},
+#line 111 "accessor_class_list.gperf"
+    {"gds_not_present_bitmap", &grib_accessor_class_gds_not_present_bitmap},
+#line 122 "accessor_class_list.gperf"
+    {"iterator", &grib_accessor_class_iterator},
+#line 186 "accessor_class_list.gperf"
+    {"statistics_spectral", &grib_accessor_class_statistics_spectral},
+#line 46 "accessor_class_list.gperf"
+    {"data_ccsds_packing", &grib_accessor_class_data_ccsds_packing},
+#line 146 "accessor_class_list.gperf"
+    {"number_of_points_gaussian", &grib_accessor_class_number_of_points_gaussian},
 #line 206 "accessor_class_list.gperf"
     {"unsigned", &grib_accessor_class_unsigned},
+#line 138 "accessor_class_list.gperf"
+    {"md5", &grib_accessor_class_md5},
+    {""}, {""},
+#line 96 "accessor_class_list.gperf"
+    {"g2_aerosol", &grib_accessor_class_g2_aerosol},
+#line 139 "accessor_class_list.gperf"
+    {"message", &grib_accessor_class_message},
+#line 207 "accessor_class_list.gperf"
+    {"unsigned_bits", &grib_accessor_class_unsigned_bits},
+#line 174 "accessor_class_list.gperf"
+    {"select_step_template", &grib_accessor_class_select_step_template},
+#line 136 "accessor_class_list.gperf"
+    {"mars_param", &grib_accessor_class_mars_param},
+#line 204 "accessor_class_list.gperf"
+    {"unexpanded_descriptors", &grib_accessor_class_unexpanded_descriptors},
+#line 193 "accessor_class_list.gperf"
+    {"to_integer", &grib_accessor_class_to_integer},
+    {""}, {""}, {""},
+#line 178 "accessor_class_list.gperf"
+    {"simple_packing_error", &grib_accessor_class_simple_packing_error},
+#line 187 "accessor_class_list.gperf"
+    {"step_human_readable", &grib_accessor_class_step_human_readable},
+#line 140 "accessor_class_list.gperf"
+    {"message_copy", &grib_accessor_class_message_copy},
+#line 163 "accessor_class_list.gperf"
+    {"raw", &grib_accessor_class_raw},
+    {""}, {""},
+#line 202 "accessor_class_list.gperf"
+    {"uint64_little_endian", &grib_accessor_class_uint64_little_endian},
+    {""},
+#line 200 "accessor_class_list.gperf"
+    {"uint32_little_endian", &grib_accessor_class_uint32_little_endian},
+#line 114 "accessor_class_list.gperf"
+    {"global_gaussian", &grib_accessor_class_global_gaussian},
+    {""}, {""},
+#line 76 "accessor_class_list.gperf"
+    {"divdouble", &grib_accessor_class_divdouble},
+    {""},
+#line 175 "accessor_class_list.gperf"
+    {"sexagesimal2decimal", &grib_accessor_class_sexagesimal2decimal},
+#line 99 "accessor_class_list.gperf"
+    {"g2_mars_labeling", &grib_accessor_class_g2_mars_labeling},
+#line 78 "accessor_class_list.gperf"
+    {"element", &grib_accessor_class_element},
+#line 160 "accessor_class_list.gperf"
+    {"padtomultiple", &grib_accessor_class_padtomultiple},
+#line 127 "accessor_class_list.gperf"
+    {"latitudes", &grib_accessor_class_latitudes},
+#line 164 "accessor_class_list.gperf"
+    {"rdbtime_guess_date", &grib_accessor_class_rdbtime_guess_date},
+    {""}, {""}, {""},
+#line 194 "accessor_class_list.gperf"
+    {"to_string", &grib_accessor_class_to_string},
+#line 132 "accessor_class_list.gperf"
+    {"long", &grib_accessor_class_long},
+#line 19 "accessor_class_list.gperf"
+    {"bufr_data_array", &grib_accessor_class_bufr_data_array},
+#line 77 "accessor_class_list.gperf"
+    {"double", &grib_accessor_class_double},
+#line 20 "accessor_class_list.gperf"
+    {"bufr_data_element", &grib_accessor_class_bufr_data_element},
+#line 105 "accessor_class_list.gperf"
+    {"g2latlon", &grib_accessor_class_g2latlon},
+    {""}, {""},
+#line 26 "accessor_class_list.gperf"
+    {"bufr_simple_thinning", &grib_accessor_class_bufr_simple_thinning},
+    {""},
+#line 137 "accessor_class_list.gperf"
+    {"mars_step", &grib_accessor_class_mars_step},
+    {""},
+#line 115 "accessor_class_list.gperf"
+    {"group", &grib_accessor_class_group},
+    {""},
+#line 28 "accessor_class_list.gperf"
+    {"bufrdc_expanded_descriptors", &grib_accessor_class_bufrdc_expanded_descriptors},
+#line 161 "accessor_class_list.gperf"
+    {"position", &grib_accessor_class_position},
+    {""}, {""}, {""},
+#line 17 "accessor_class_list.gperf"
+    {"blob", &grib_accessor_class_blob},
+#line 109 "accessor_class_list.gperf"
+    {"gaussian_grid_name", &grib_accessor_class_gaussian_grid_name},
+#line 197 "accessor_class_list.gperf"
+    {"trim", &grib_accessor_class_trim},
+    {""}, {""},
+#line 119 "accessor_class_list.gperf"
+    {"ibmfloat", &grib_accessor_class_ibmfloat},
+    {""}, {""},
 #line 195 "accessor_class_list.gperf"
     {"transient", &grib_accessor_class_transient},
+#line 55 "accessor_class_list.gperf"
+    {"data_g1shsimple_packing", &grib_accessor_class_data_g1shsimple_packing},
+    {""}, {""},
+#line 56 "accessor_class_list.gperf"
+    {"data_g1simple_packing", &grib_accessor_class_data_g1simple_packing},
+#line 49 "accessor_class_list.gperf"
+    {"data_g1complex_packing", &grib_accessor_class_data_g1complex_packing},
+#line 166 "accessor_class_list.gperf"
+    {"round", &grib_accessor_class_round},
+#line 196 "accessor_class_list.gperf"
+    {"transient_darray", &grib_accessor_class_transient_darray},
+#line 18 "accessor_class_list.gperf"
+    {"budgdate", &grib_accessor_class_budgdate},
+#line 210 "accessor_class_list.gperf"
+    {"values", &grib_accessor_class_values},
+#line 144 "accessor_class_list.gperf"
+    {"number_of_coded_values", &grib_accessor_class_number_of_coded_values},
+#line 126 "accessor_class_list.gperf"
+    {"label", &grib_accessor_class_label},
+    {""}, {""},
+#line 38 "accessor_class_list.gperf"
+    {"concept", &grib_accessor_class_concept},
+    {""},
+#line 183 "accessor_class_list.gperf"
+    {"spectral_truncation", &grib_accessor_class_spectral_truncation},
+    {""}, {""},
+#line 83 "accessor_class_list.gperf"
+    {"g1_message_length", &grib_accessor_class_g1_message_length},
+#line 184 "accessor_class_list.gperf"
+    {"sprintf", &grib_accessor_class_sprintf},
+#line 190 "accessor_class_list.gperf"
+    {"suppressed", &grib_accessor_class_suppressed},
+    {""},
+#line 213 "accessor_class_list.gperf"
+    {"when", &grib_accessor_class_when},
+    {""}, {""},
 #line 180 "accessor_class_list.gperf"
     {"smart_table", &grib_accessor_class_smart_table},
-#line 122 "accessor_class_list.gperf"
-    {"iterator", &grib_accessor_class_iterator}
+    {""},
+#line 39 "accessor_class_list.gperf"
+    {"constant", &grib_accessor_class_constant},
+    {""}, {""},
+#line 162 "accessor_class_list.gperf"
+    {"proj_string", &grib_accessor_class_proj_string},
+#line 150 "accessor_class_list.gperf"
+    {"octet_number", &grib_accessor_class_octet_number},
+#line 181 "accessor_class_list.gperf"
+    {"smart_table_column", &grib_accessor_class_smart_table_column},
+    {""},
+#line 135 "accessor_class_list.gperf"
+    {"lookup", &grib_accessor_class_lookup},
+    {""},
+#line 94 "accessor_class_list.gperf"
+    {"g1step_range", &grib_accessor_class_g1step_range},
+#line 73 "accessor_class_list.gperf"
+    {"decimal_precision", &grib_accessor_class_decimal_precision},
+    {""},
+#line 134 "accessor_class_list.gperf"
+    {"longitudes", &grib_accessor_class_longitudes},
+#line 70 "accessor_class_list.gperf"
+    {"data_sh_unpacked", &grib_accessor_class_data_sh_unpacked},
+#line 27 "accessor_class_list.gperf"
+    {"bufr_string_values", &grib_accessor_class_bufr_string_values},
+#line 198 "accessor_class_list.gperf"
+    {"uint16", &grib_accessor_class_uint16},
+    {""}, {""},
+#line 71 "accessor_class_list.gperf"
+    {"data_shsimple_packing", &grib_accessor_class_data_shsimple_packing},
+#line 86 "accessor_class_list.gperf"
+    {"g1date", &grib_accessor_class_g1date},
+    {""},
+#line 85 "accessor_class_list.gperf"
+    {"g1bitmap", &grib_accessor_class_g1bitmap},
+    {""},
+#line 54 "accessor_class_list.gperf"
+    {"data_g1secondary_bitmap", &grib_accessor_class_data_g1secondary_bitmap},
+#line 192 "accessor_class_list.gperf"
+    {"to_double", &grib_accessor_class_to_double},
+#line 101 "accessor_class_list.gperf"
+    {"g2bitmap_present", &grib_accessor_class_g2bitmap_present},
+#line 120 "accessor_class_list.gperf"
+    {"ieeefloat", &grib_accessor_class_ieeefloat},
+#line 151 "accessor_class_list.gperf"
+    {"offset_file", &grib_accessor_class_offset_file},
+#line 208 "accessor_class_list.gperf"
+    {"validity_date", &grib_accessor_class_validity_date},
+#line 209 "accessor_class_list.gperf"
+    {"validity_time", &grib_accessor_class_validity_time},
+    {""},
+#line 130 "accessor_class_list.gperf"
+    {"library_version", &grib_accessor_class_library_version},
+#line 212 "accessor_class_list.gperf"
+    {"vector", &grib_accessor_class_vector},
+#line 84 "accessor_class_list.gperf"
+    {"g1_section4_length", &grib_accessor_class_g1_section4_length},
+#line 141 "accessor_class_list.gperf"
+    {"multdouble", &grib_accessor_class_multdouble},
+#line 52 "accessor_class_list.gperf"
+    {"data_g1second_order_general_packing", &grib_accessor_class_data_g1second_order_general_packing},
+    {""}, {""},
+#line 53 "accessor_class_list.gperf"
+    {"data_g1second_order_row_by_row_packing", &grib_accessor_class_data_g1second_order_row_by_row_packing},
+    {""},
+#line 24 "accessor_class_list.gperf"
+    {"bufr_extract_subsets", &grib_accessor_class_bufr_extract_subsets},
+#line 159 "accessor_class_list.gperf"
+    {"padtoeven", &grib_accessor_class_padtoeven},
+#line 50 "accessor_class_list.gperf"
+    {"data_g1second_order_constant_width_packing", &grib_accessor_class_data_g1second_order_constant_width_packing},
+    {""},
+#line 51 "accessor_class_list.gperf"
+    {"data_g1second_order_general_extended_packing", &grib_accessor_class_data_g1second_order_general_extended_packing},
+#line 22 "accessor_class_list.gperf"
+    {"bufr_extract_area_subsets", &grib_accessor_class_bufr_extract_area_subsets},
+    {""}, {""}, {""},
+#line 23 "accessor_class_list.gperf"
+    {"bufr_extract_datetime_subsets", &grib_accessor_class_bufr_extract_datetime_subsets},
+    {""},
+#line 21 "accessor_class_list.gperf"
+    {"bufr_elements_table", &grib_accessor_class_bufr_elements_table},
+    {""}, {""}, {""}, {""},
+#line 154 "accessor_class_list.gperf"
+    {"pack_bufr_values", &grib_accessor_class_pack_bufr_values},
+#line 35 "accessor_class_list.gperf"
+    {"codetable", &grib_accessor_class_codetable},
+#line 131 "accessor_class_list.gperf"
+    {"local_definition", &grib_accessor_class_local_definition},
+    {""},
+#line 25 "accessor_class_list.gperf"
+    {"bufr_group", &grib_accessor_class_bufr_group},
+    {""},
+#line 88 "accessor_class_list.gperf"
+    {"g1end_of_interval_monthly", &grib_accessor_class_g1end_of_interval_monthly},
+#line 147 "accessor_class_list.gperf"
+    {"number_of_values", &grib_accessor_class_number_of_values},
+    {""},
+#line 116 "accessor_class_list.gperf"
+    {"gts_header", &grib_accessor_class_gts_header},
+    {""},
+#line 33 "accessor_class_list.gperf"
+    {"closest_date", &grib_accessor_class_closest_date},
+#line 153 "accessor_class_list.gperf"
+    {"optimal_step_units", &grib_accessor_class_optimal_step_units},
+    {""},
+#line 211 "accessor_class_list.gperf"
+    {"variable", &grib_accessor_class_variable},
+#line 133 "accessor_class_list.gperf"
+    {"long_vector", &grib_accessor_class_long_vector},
+#line 168 "accessor_class_list.gperf"
+    {"scale_values", &grib_accessor_class_scale_values},
+    {""}, {""}, {""},
+#line 128 "accessor_class_list.gperf"
+    {"latlon_increment", &grib_accessor_class_latlon_increment},
+    {""}, {""}, {""},
+#line 148 "accessor_class_list.gperf"
+    {"number_of_values_data_raw_packing", &grib_accessor_class_number_of_values_data_raw_packing},
+    {""},
+#line 79 "accessor_class_list.gperf"
+    {"evaluate", &grib_accessor_class_evaluate},
+    {""}, {""}, {""}, {""}, {""},
+#line 152 "accessor_class_list.gperf"
+    {"offset_values", &grib_accessor_class_offset_values},
+#line 69 "accessor_class_list.gperf"
+    {"data_sh_packed", &grib_accessor_class_data_sh_packed},
+#line 11 "accessor_class_list.gperf"
+    {"abstract_vector", &grib_accessor_class_abstract_vector},
+#line 118 "accessor_class_list.gperf"
+    {"headers_only", &grib_accessor_class_headers_only},
+#line 125 "accessor_class_list.gperf"
+    {"ksec1expver", &grib_accessor_class_ksec1expver},
+    {""}, {""},
+#line 41 "accessor_class_list.gperf"
+    {"count_missing", &grib_accessor_class_count_missing},
+#line 205 "accessor_class_list.gperf"
+    {"unpack_bufr_values", &grib_accessor_class_unpack_bufr_values},
+    {""}, {""},
+#line 121 "accessor_class_list.gperf"
+    {"ifs_param", &grib_accessor_class_ifs_param},
+    {""}, {""}, {""},
+#line 36 "accessor_class_list.gperf"
+    {"codetable_title", &grib_accessor_class_codetable_title},
+    {""}, {""}, {""},
+#line 89 "accessor_class_list.gperf"
+    {"g1fcperiod", &grib_accessor_class_g1fcperiod},
+#line 34 "accessor_class_list.gperf"
+    {"codeflag", &grib_accessor_class_codeflag},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 106 "accessor_class_list.gperf"
+    {"g2level", &grib_accessor_class_g2level},
+#line 42 "accessor_class_list.gperf"
+    {"count_total", &grib_accessor_class_count_total},
+    {""},
+#line 117 "accessor_class_list.gperf"
+    {"hash_array", &grib_accessor_class_hash_array},
+    {""}, {""},
+#line 37 "accessor_class_list.gperf"
+    {"codetable_units", &grib_accessor_class_codetable_units},
+    {""}, {""},
+#line 129 "accessor_class_list.gperf"
+    {"latlonvalues", &grib_accessor_class_latlonvalues},
+    {""}, {""}, {""}, {""},
+#line 30 "accessor_class_list.gperf"
+    {"change_alternative_row_scanning", &grib_accessor_class_change_alternative_row_scanning},
+    {""}, {""}, {""}, {""}, {""}, {""},
+#line 31 "accessor_class_list.gperf"
+    {"change_scanning_direction", &grib_accessor_class_change_scanning_direction},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 149 "accessor_class_list.gperf"
+    {"octahedral_gaussian", &grib_accessor_class_octahedral_gaussian},
+#line 10 "accessor_class_list.gperf"
+    {"abstract_long_vector", &grib_accessor_class_abstract_long_vector},
+    {""}, {""}, {""},
+#line 40 "accessor_class_list.gperf"
+    {"count_file", &grib_accessor_class_count_file},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 91 "accessor_class_list.gperf"
+    {"g1monthlydate", &grib_accessor_class_g1monthlydate},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 82 "accessor_class_list.gperf"
+    {"g1_half_byte_codeflag", &grib_accessor_class_g1_half_byte_codeflag},
+    {""},
+#line 81 "accessor_class_list.gperf"
+    {"from_scale_factor_scaled_value", &grib_accessor_class_from_scale_factor_scaled_value},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 32 "accessor_class_list.gperf"
+    {"check_internal_version", &grib_accessor_class_check_internal_version},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {""}, {""}, {""},
+#line 97 "accessor_class_list.gperf"
+    {"g2_chemical", &grib_accessor_class_g2_chemical},
+#line 87 "accessor_class_list.gperf"
+    {"g1day_of_the_year_date", &grib_accessor_class_g1day_of_the_year_date},
+    {""}, {""}, {""}, {""}, {""},
+#line 165 "accessor_class_list.gperf"
+    {"reference_value_error", &grib_accessor_class_reference_value_error},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {""}, {""}, {""}, {""}, {""}, {""},
+#line 93 "accessor_class_list.gperf"
+    {"g1number_of_coded_values_sh_simple", &grib_accessor_class_g1number_of_coded_values_sh_simple},
+#line 92 "accessor_class_list.gperf"
+    {"g1number_of_coded_values_sh_complex", &grib_accessor_class_g1number_of_coded_values_sh_complex},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {""}, {""},
+#line 90 "accessor_class_list.gperf"
+    {"g1forecastmonth", &grib_accessor_class_g1forecastmonth},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 95 "accessor_class_list.gperf"
+    {"g1verificationdate", &grib_accessor_class_g1verificationdate}
   };
 
 const struct accessor_class_hash *
diff --git a/src/grib_accessor_factory.h b/src/grib_accessor_factory.h
index 644d2e89b..2f889a0c6 100644
--- a/src/grib_accessor_factory.h
+++ b/src/grib_accessor_factory.h
@@ -1,205 +1,205 @@
 /* This file is automatically generated by ./make_class.pl, do not edit */
-//{ "abstract_long_vector", &grib_accessor_class_abstract_long_vector, },
-//{ "abstract_vector", &grib_accessor_class_abstract_vector, },
-//{ "ascii", &grib_accessor_class_ascii, },
-//{ "bit", &grib_accessor_class_bit, },
-//{ "bitmap", &grib_accessor_class_bitmap, },
-//{ "bits", &grib_accessor_class_bits, },
-//{ "bits_per_value", &grib_accessor_class_bits_per_value, },
-//{ "blob", &grib_accessor_class_blob, },
-//{ "budgdate", &grib_accessor_class_budgdate, },
-//{ "bufr_data_array", &grib_accessor_class_bufr_data_array, },
-//{ "bufr_data_element", &grib_accessor_class_bufr_data_element, },
-//{ "bufr_elements_table", &grib_accessor_class_bufr_elements_table, },
-//{ "bufr_extract_area_subsets", &grib_accessor_class_bufr_extract_area_subsets, },
-//{ "bufr_extract_datetime_subsets", &grib_accessor_class_bufr_extract_datetime_subsets, },
-//{ "bufr_extract_subsets", &grib_accessor_class_bufr_extract_subsets, },
-//{ "bufr_group", &grib_accessor_class_bufr_group, },
-//{ "bufr_simple_thinning", &grib_accessor_class_bufr_simple_thinning, },
-//{ "bufr_string_values", &grib_accessor_class_bufr_string_values, },
-//{ "bufrdc_expanded_descriptors", &grib_accessor_class_bufrdc_expanded_descriptors, },
-//{ "bytes", &grib_accessor_class_bytes, },
-//{ "change_alternative_row_scanning", &grib_accessor_class_change_alternative_row_scanning, },
-//{ "change_scanning_direction", &grib_accessor_class_change_scanning_direction, },
-//{ "check_internal_version", &grib_accessor_class_check_internal_version, },
-//{ "closest_date", &grib_accessor_class_closest_date, },
-//{ "codeflag", &grib_accessor_class_codeflag, },
+{ "abstract_long_vector", &grib_accessor_class_abstract_long_vector, },
+{ "abstract_vector", &grib_accessor_class_abstract_vector, },
+{ "ascii", &grib_accessor_class_ascii, },
+{ "bit", &grib_accessor_class_bit, },
+{ "bitmap", &grib_accessor_class_bitmap, },
+{ "bits", &grib_accessor_class_bits, },
+{ "bits_per_value", &grib_accessor_class_bits_per_value, },
+{ "blob", &grib_accessor_class_blob, },
+{ "budgdate", &grib_accessor_class_budgdate, },
+{ "bufr_data_array", &grib_accessor_class_bufr_data_array, },
+{ "bufr_data_element", &grib_accessor_class_bufr_data_element, },
+{ "bufr_elements_table", &grib_accessor_class_bufr_elements_table, },
+{ "bufr_extract_area_subsets", &grib_accessor_class_bufr_extract_area_subsets, },
+{ "bufr_extract_datetime_subsets", &grib_accessor_class_bufr_extract_datetime_subsets, },
+{ "bufr_extract_subsets", &grib_accessor_class_bufr_extract_subsets, },
+{ "bufr_group", &grib_accessor_class_bufr_group, },
+{ "bufr_simple_thinning", &grib_accessor_class_bufr_simple_thinning, },
+{ "bufr_string_values", &grib_accessor_class_bufr_string_values, },
+{ "bufrdc_expanded_descriptors", &grib_accessor_class_bufrdc_expanded_descriptors, },
+{ "bytes", &grib_accessor_class_bytes, },
+{ "change_alternative_row_scanning", &grib_accessor_class_change_alternative_row_scanning, },
+{ "change_scanning_direction", &grib_accessor_class_change_scanning_direction, },
+{ "check_internal_version", &grib_accessor_class_check_internal_version, },
+{ "closest_date", &grib_accessor_class_closest_date, },
+{ "codeflag", &grib_accessor_class_codeflag, },
 { "codetable", &grib_accessor_class_codetable, },
-//{ "codetable_title", &grib_accessor_class_codetable_title, },
-//{ "codetable_units", &grib_accessor_class_codetable_units, },
-//{ "concept", &grib_accessor_class_concept, },
+{ "codetable_title", &grib_accessor_class_codetable_title, },
+{ "codetable_units", &grib_accessor_class_codetable_units, },
+{ "concept", &grib_accessor_class_concept, },
 { "constant", &grib_accessor_class_constant, },
-//{ "count_file", &grib_accessor_class_count_file, },
-//{ "count_missing", &grib_accessor_class_count_missing, },
-//{ "count_total", &grib_accessor_class_count_total, },
-//{ "data_apply_bitmap", &grib_accessor_class_data_apply_bitmap, },
-//{ "data_apply_boustrophedonic", &grib_accessor_class_data_apply_boustrophedonic, },
-//{ "data_apply_boustrophedonic_bitmap", &grib_accessor_class_data_apply_boustrophedonic_bitmap, },
-//{ "data_ccsds_packing", &grib_accessor_class_data_ccsds_packing, },
-//{ "data_complex_packing", &grib_accessor_class_data_complex_packing, },
-//{ "data_dummy_field", &grib_accessor_class_data_dummy_field, },
-//{ "data_g1complex_packing", &grib_accessor_class_data_g1complex_packing, },
-//{ "data_g1second_order_constant_width_packing", &grib_accessor_class_data_g1second_order_constant_width_packing, },
-//{ "data_g1second_order_general_extended_packing", &grib_accessor_class_data_g1second_order_general_extended_packing, },
-//{ "data_g1second_order_general_packing", &grib_accessor_class_data_g1second_order_general_packing, },
-//{ "data_g1second_order_row_by_row_packing", &grib_accessor_class_data_g1second_order_row_by_row_packing, },
-//{ "data_g1secondary_bitmap", &grib_accessor_class_data_g1secondary_bitmap, },
-//{ "data_g1shsimple_packing", &grib_accessor_class_data_g1shsimple_packing, },
-//{ "data_g1simple_packing", &grib_accessor_class_data_g1simple_packing, },
-//{ "data_g22order_packing", &grib_accessor_class_data_g22order_packing, },
-//{ "data_g2bifourier_packing", &grib_accessor_class_data_g2bifourier_packing, },
-//{ "data_g2complex_packing", &grib_accessor_class_data_g2complex_packing, },
-//{ "data_g2secondary_bitmap", &grib_accessor_class_data_g2secondary_bitmap, },
-//{ "data_g2shsimple_packing", &grib_accessor_class_data_g2shsimple_packing, },
-//{ "data_g2simple_packing", &grib_accessor_class_data_g2simple_packing, },
-//{ "data_g2simple_packing_with_preprocessing", &grib_accessor_class_data_g2simple_packing_with_preprocessing, },
-//{ "data_jpeg2000_packing", &grib_accessor_class_data_jpeg2000_packing, },
-//{ "data_png_packing", &grib_accessor_class_data_png_packing, },
-//{ "data_raw_packing", &grib_accessor_class_data_raw_packing, },
-//{ "data_run_length_packing", &grib_accessor_class_data_run_length_packing, },
-//{ "data_secondary_bitmap", &grib_accessor_class_data_secondary_bitmap, },
-//{ "data_sh_packed", &grib_accessor_class_data_sh_packed, },
-//{ "data_sh_unpacked", &grib_accessor_class_data_sh_unpacked, },
-//{ "data_shsimple_packing", &grib_accessor_class_data_shsimple_packing, },
-//{ "data_simple_packing", &grib_accessor_class_data_simple_packing, },
-//{ "decimal_precision", &grib_accessor_class_decimal_precision, },
-//{ "dictionary", &grib_accessor_class_dictionary, },
-//{ "dirty", &grib_accessor_class_dirty, },
-//{ "divdouble", &grib_accessor_class_divdouble, },
-//{ "double", &grib_accessor_class_double, },
-//{ "element", &grib_accessor_class_element, },
-//{ "evaluate", &grib_accessor_class_evaluate, },
-//{ "expanded_descriptors", &grib_accessor_class_expanded_descriptors, },
-//{ "from_scale_factor_scaled_value", &grib_accessor_class_from_scale_factor_scaled_value, },
-//{ "g1_half_byte_codeflag", &grib_accessor_class_g1_half_byte_codeflag, },
-//{ "g1_message_length", &grib_accessor_class_g1_message_length, },
-//{ "g1_section4_length", &grib_accessor_class_g1_section4_length, },
-//{ "g1bitmap", &grib_accessor_class_g1bitmap, },
-//{ "g1date", &grib_accessor_class_g1date, },
-//{ "g1day_of_the_year_date", &grib_accessor_class_g1day_of_the_year_date, },
-//{ "g1end_of_interval_monthly", &grib_accessor_class_g1end_of_interval_monthly, },
-//{ "g1fcperiod", &grib_accessor_class_g1fcperiod, },
-//{ "g1forecastmonth", &grib_accessor_class_g1forecastmonth, },
-//{ "g1monthlydate", &grib_accessor_class_g1monthlydate, },
-//{ "g1number_of_coded_values_sh_complex", &grib_accessor_class_g1number_of_coded_values_sh_complex, },
-//{ "g1number_of_coded_values_sh_simple", &grib_accessor_class_g1number_of_coded_values_sh_simple, },
-//{ "g1step_range", &grib_accessor_class_g1step_range, },
-//{ "g1verificationdate", &grib_accessor_class_g1verificationdate, },
-//{ "g2_aerosol", &grib_accessor_class_g2_aerosol, },
-//{ "g2_chemical", &grib_accessor_class_g2_chemical, },
-//{ "g2_eps", &grib_accessor_class_g2_eps, },
-//{ "g2_mars_labeling", &grib_accessor_class_g2_mars_labeling, },
-//{ "g2bitmap", &grib_accessor_class_g2bitmap, },
-//{ "g2bitmap_present", &grib_accessor_class_g2bitmap_present, },
-//{ "g2date", &grib_accessor_class_g2date, },
-//{ "g2end_step", &grib_accessor_class_g2end_step, },
-//{ "g2grid", &grib_accessor_class_g2grid, },
-//{ "g2latlon", &grib_accessor_class_g2latlon, },
-//{ "g2level", &grib_accessor_class_g2level, },
-//{ "g2lon", &grib_accessor_class_g2lon, },
-//{ "g2step_range", &grib_accessor_class_g2step_range, },
-//{ "gaussian_grid_name", &grib_accessor_class_gaussian_grid_name, },
-//{ "gds_is_present", &grib_accessor_class_gds_is_present, },
-//{ "gds_not_present_bitmap", &grib_accessor_class_gds_not_present_bitmap, },
-//{ "gen", &grib_accessor_class_gen, },
-//{ "getenv", &grib_accessor_class_getenv, },
-//{ "global_gaussian", &grib_accessor_class_global_gaussian, },
-//{ "group", &grib_accessor_class_group, },
-//{ "gts_header", &grib_accessor_class_gts_header, },
-//{ "hash_array", &grib_accessor_class_hash_array, },
-//{ "headers_only", &grib_accessor_class_headers_only, },
-//{ "ibmfloat", &grib_accessor_class_ibmfloat, },
-//{ "ieeefloat", &grib_accessor_class_ieeefloat, },
-//{ "ifs_param", &grib_accessor_class_ifs_param, },
+{ "count_file", &grib_accessor_class_count_file, },
+{ "count_missing", &grib_accessor_class_count_missing, },
+{ "count_total", &grib_accessor_class_count_total, },
+{ "data_apply_bitmap", &grib_accessor_class_data_apply_bitmap, },
+{ "data_apply_boustrophedonic", &grib_accessor_class_data_apply_boustrophedonic, },
+{ "data_apply_boustrophedonic_bitmap", &grib_accessor_class_data_apply_boustrophedonic_bitmap, },
+{ "data_ccsds_packing", &grib_accessor_class_data_ccsds_packing, },
+{ "data_complex_packing", &grib_accessor_class_data_complex_packing, },
+{ "data_dummy_field", &grib_accessor_class_data_dummy_field, },
+{ "data_g1complex_packing", &grib_accessor_class_data_g1complex_packing, },
+{ "data_g1second_order_constant_width_packing", &grib_accessor_class_data_g1second_order_constant_width_packing, },
+{ "data_g1second_order_general_extended_packing", &grib_accessor_class_data_g1second_order_general_extended_packing, },
+{ "data_g1second_order_general_packing", &grib_accessor_class_data_g1second_order_general_packing, },
+{ "data_g1second_order_row_by_row_packing", &grib_accessor_class_data_g1second_order_row_by_row_packing, },
+{ "data_g1secondary_bitmap", &grib_accessor_class_data_g1secondary_bitmap, },
+{ "data_g1shsimple_packing", &grib_accessor_class_data_g1shsimple_packing, },
+{ "data_g1simple_packing", &grib_accessor_class_data_g1simple_packing, },
+{ "data_g22order_packing", &grib_accessor_class_data_g22order_packing, },
+{ "data_g2bifourier_packing", &grib_accessor_class_data_g2bifourier_packing, },
+{ "data_g2complex_packing", &grib_accessor_class_data_g2complex_packing, },
+{ "data_g2secondary_bitmap", &grib_accessor_class_data_g2secondary_bitmap, },
+{ "data_g2shsimple_packing", &grib_accessor_class_data_g2shsimple_packing, },
+{ "data_g2simple_packing", &grib_accessor_class_data_g2simple_packing, },
+{ "data_g2simple_packing_with_preprocessing", &grib_accessor_class_data_g2simple_packing_with_preprocessing, },
+{ "data_jpeg2000_packing", &grib_accessor_class_data_jpeg2000_packing, },
+{ "data_png_packing", &grib_accessor_class_data_png_packing, },
+{ "data_raw_packing", &grib_accessor_class_data_raw_packing, },
+{ "data_run_length_packing", &grib_accessor_class_data_run_length_packing, },
+{ "data_secondary_bitmap", &grib_accessor_class_data_secondary_bitmap, },
+{ "data_sh_packed", &grib_accessor_class_data_sh_packed, },
+{ "data_sh_unpacked", &grib_accessor_class_data_sh_unpacked, },
+{ "data_shsimple_packing", &grib_accessor_class_data_shsimple_packing, },
+{ "data_simple_packing", &grib_accessor_class_data_simple_packing, },
+{ "decimal_precision", &grib_accessor_class_decimal_precision, },
+{ "dictionary", &grib_accessor_class_dictionary, },
+{ "dirty", &grib_accessor_class_dirty, },
+{ "divdouble", &grib_accessor_class_divdouble, },
+{ "double", &grib_accessor_class_double, },
+{ "element", &grib_accessor_class_element, },
+{ "evaluate", &grib_accessor_class_evaluate, },
+{ "expanded_descriptors", &grib_accessor_class_expanded_descriptors, },
+{ "from_scale_factor_scaled_value", &grib_accessor_class_from_scale_factor_scaled_value, },
+{ "g1_half_byte_codeflag", &grib_accessor_class_g1_half_byte_codeflag, },
+{ "g1_message_length", &grib_accessor_class_g1_message_length, },
+{ "g1_section4_length", &grib_accessor_class_g1_section4_length, },
+{ "g1bitmap", &grib_accessor_class_g1bitmap, },
+{ "g1date", &grib_accessor_class_g1date, },
+{ "g1day_of_the_year_date", &grib_accessor_class_g1day_of_the_year_date, },
+{ "g1end_of_interval_monthly", &grib_accessor_class_g1end_of_interval_monthly, },
+{ "g1fcperiod", &grib_accessor_class_g1fcperiod, },
+{ "g1forecastmonth", &grib_accessor_class_g1forecastmonth, },
+{ "g1monthlydate", &grib_accessor_class_g1monthlydate, },
+{ "g1number_of_coded_values_sh_complex", &grib_accessor_class_g1number_of_coded_values_sh_complex, },
+{ "g1number_of_coded_values_sh_simple", &grib_accessor_class_g1number_of_coded_values_sh_simple, },
+{ "g1step_range", &grib_accessor_class_g1step_range, },
+{ "g1verificationdate", &grib_accessor_class_g1verificationdate, },
+{ "g2_aerosol", &grib_accessor_class_g2_aerosol, },
+{ "g2_chemical", &grib_accessor_class_g2_chemical, },
+{ "g2_eps", &grib_accessor_class_g2_eps, },
+{ "g2_mars_labeling", &grib_accessor_class_g2_mars_labeling, },
+{ "g2bitmap", &grib_accessor_class_g2bitmap, },
+{ "g2bitmap_present", &grib_accessor_class_g2bitmap_present, },
+{ "g2date", &grib_accessor_class_g2date, },
+{ "g2end_step", &grib_accessor_class_g2end_step, },
+{ "g2grid", &grib_accessor_class_g2grid, },
+{ "g2latlon", &grib_accessor_class_g2latlon, },
+{ "g2level", &grib_accessor_class_g2level, },
+{ "g2lon", &grib_accessor_class_g2lon, },
+{ "g2step_range", &grib_accessor_class_g2step_range, },
+{ "gaussian_grid_name", &grib_accessor_class_gaussian_grid_name, },
+{ "gds_is_present", &grib_accessor_class_gds_is_present, },
+{ "gds_not_present_bitmap", &grib_accessor_class_gds_not_present_bitmap, },
+{ "gen", &grib_accessor_class_gen, },
+{ "getenv", &grib_accessor_class_getenv, },
+{ "global_gaussian", &grib_accessor_class_global_gaussian, },
+{ "group", &grib_accessor_class_group, },
+{ "gts_header", &grib_accessor_class_gts_header, },
+{ "hash_array", &grib_accessor_class_hash_array, },
+{ "headers_only", &grib_accessor_class_headers_only, },
+{ "ibmfloat", &grib_accessor_class_ibmfloat, },
+{ "ieeefloat", &grib_accessor_class_ieeefloat, },
+{ "ifs_param", &grib_accessor_class_ifs_param, },
 { "iterator", &grib_accessor_class_iterator, },
-//{ "julian_date", &grib_accessor_class_julian_date, },
-//{ "julian_day", &grib_accessor_class_julian_day, },
-//{ "ksec1expver", &grib_accessor_class_ksec1expver, },
-//{ "label", &grib_accessor_class_label, },
-//{ "latitudes", &grib_accessor_class_latitudes, },
-//{ "latlon_increment", &grib_accessor_class_latlon_increment, },
-//{ "latlonvalues", &grib_accessor_class_latlonvalues, },
-//{ "library_version", &grib_accessor_class_library_version, },
-//{ "local_definition", &grib_accessor_class_local_definition, },
+{ "julian_date", &grib_accessor_class_julian_date, },
+{ "julian_day", &grib_accessor_class_julian_day, },
+{ "ksec1expver", &grib_accessor_class_ksec1expver, },
+{ "label", &grib_accessor_class_label, },
+{ "latitudes", &grib_accessor_class_latitudes, },
+{ "latlon_increment", &grib_accessor_class_latlon_increment, },
+{ "latlonvalues", &grib_accessor_class_latlonvalues, },
+{ "library_version", &grib_accessor_class_library_version, },
+{ "local_definition", &grib_accessor_class_local_definition, },
 { "long", &grib_accessor_class_long, },
-//{ "long_vector", &grib_accessor_class_long_vector, },
-//{ "longitudes", &grib_accessor_class_longitudes, },
-//{ "lookup", &grib_accessor_class_lookup, },
-//{ "mars_param", &grib_accessor_class_mars_param, },
-//{ "mars_step", &grib_accessor_class_mars_step, },
-//{ "md5", &grib_accessor_class_md5, },
-//{ "message", &grib_accessor_class_message, },
-//{ "message_copy", &grib_accessor_class_message_copy, },
-//{ "multdouble", &grib_accessor_class_multdouble, },
+{ "long_vector", &grib_accessor_class_long_vector, },
+{ "longitudes", &grib_accessor_class_longitudes, },
+{ "lookup", &grib_accessor_class_lookup, },
+{ "mars_param", &grib_accessor_class_mars_param, },
+{ "mars_step", &grib_accessor_class_mars_step, },
+{ "md5", &grib_accessor_class_md5, },
+{ "message", &grib_accessor_class_message, },
+{ "message_copy", &grib_accessor_class_message_copy, },
+{ "multdouble", &grib_accessor_class_multdouble, },
 { "nearest", &grib_accessor_class_nearest, },
-//{ "non_alpha", &grib_accessor_class_non_alpha, },
-//{ "number_of_coded_values", &grib_accessor_class_number_of_coded_values, },
-//{ "number_of_points", &grib_accessor_class_number_of_points, },
-//{ "number_of_points_gaussian", &grib_accessor_class_number_of_points_gaussian, },
-//{ "number_of_values", &grib_accessor_class_number_of_values, },
-//{ "number_of_values_data_raw_packing", &grib_accessor_class_number_of_values_data_raw_packing, },
-//{ "octahedral_gaussian", &grib_accessor_class_octahedral_gaussian, },
-//{ "octet_number", &grib_accessor_class_octet_number, },
-//{ "offset_file", &grib_accessor_class_offset_file, },
-//{ "offset_values", &grib_accessor_class_offset_values, },
-//{ "optimal_step_units", &grib_accessor_class_optimal_step_units, },
-//{ "pack_bufr_values", &grib_accessor_class_pack_bufr_values, },
-//{ "packing_type", &grib_accessor_class_packing_type, },
-//{ "pad", &grib_accessor_class_pad, },
-//{ "padding", &grib_accessor_class_padding, },
-//{ "padto", &grib_accessor_class_padto, },
-//{ "padtoeven", &grib_accessor_class_padtoeven, },
-//{ "padtomultiple", &grib_accessor_class_padtomultiple, },
-//{ "position", &grib_accessor_class_position, },
-//{ "proj_string", &grib_accessor_class_proj_string, },
-//{ "raw", &grib_accessor_class_raw, },
-//{ "rdbtime_guess_date", &grib_accessor_class_rdbtime_guess_date, },
-//{ "reference_value_error", &grib_accessor_class_reference_value_error, },
-//{ "round", &grib_accessor_class_round, },
-//{ "scale", &grib_accessor_class_scale, },
-//{ "scale_values", &grib_accessor_class_scale_values, },
-//{ "second_order_bits_per_value", &grib_accessor_class_second_order_bits_per_value, },
-//{ "section", &grib_accessor_class_section, },
-//{ "section_length", &grib_accessor_class_section_length, },
-//{ "section_padding", &grib_accessor_class_section_padding, },
-//{ "section_pointer", &grib_accessor_class_section_pointer, },
-//{ "select_step_template", &grib_accessor_class_select_step_template, },
-//{ "sexagesimal2decimal", &grib_accessor_class_sexagesimal2decimal, },
-//{ "signed", &grib_accessor_class_signed, },
-//{ "signed_bits", &grib_accessor_class_signed_bits, },
-//{ "simple_packing_error", &grib_accessor_class_simple_packing_error, },
-//{ "size", &grib_accessor_class_size, },
+{ "non_alpha", &grib_accessor_class_non_alpha, },
+{ "number_of_coded_values", &grib_accessor_class_number_of_coded_values, },
+{ "number_of_points", &grib_accessor_class_number_of_points, },
+{ "number_of_points_gaussian", &grib_accessor_class_number_of_points_gaussian, },
+{ "number_of_values", &grib_accessor_class_number_of_values, },
+{ "number_of_values_data_raw_packing", &grib_accessor_class_number_of_values_data_raw_packing, },
+{ "octahedral_gaussian", &grib_accessor_class_octahedral_gaussian, },
+{ "octet_number", &grib_accessor_class_octet_number, },
+{ "offset_file", &grib_accessor_class_offset_file, },
+{ "offset_values", &grib_accessor_class_offset_values, },
+{ "optimal_step_units", &grib_accessor_class_optimal_step_units, },
+{ "pack_bufr_values", &grib_accessor_class_pack_bufr_values, },
+{ "packing_type", &grib_accessor_class_packing_type, },
+{ "pad", &grib_accessor_class_pad, },
+{ "padding", &grib_accessor_class_padding, },
+{ "padto", &grib_accessor_class_padto, },
+{ "padtoeven", &grib_accessor_class_padtoeven, },
+{ "padtomultiple", &grib_accessor_class_padtomultiple, },
+{ "position", &grib_accessor_class_position, },
+{ "proj_string", &grib_accessor_class_proj_string, },
+{ "raw", &grib_accessor_class_raw, },
+{ "rdbtime_guess_date", &grib_accessor_class_rdbtime_guess_date, },
+{ "reference_value_error", &grib_accessor_class_reference_value_error, },
+{ "round", &grib_accessor_class_round, },
+{ "scale", &grib_accessor_class_scale, },
+{ "scale_values", &grib_accessor_class_scale_values, },
+{ "second_order_bits_per_value", &grib_accessor_class_second_order_bits_per_value, },
+{ "section", &grib_accessor_class_section, },
+{ "section_length", &grib_accessor_class_section_length, },
+{ "section_padding", &grib_accessor_class_section_padding, },
+{ "section_pointer", &grib_accessor_class_section_pointer, },
+{ "select_step_template", &grib_accessor_class_select_step_template, },
+{ "sexagesimal2decimal", &grib_accessor_class_sexagesimal2decimal, },
+{ "signed", &grib_accessor_class_signed, },
+{ "signed_bits", &grib_accessor_class_signed_bits, },
+{ "simple_packing_error", &grib_accessor_class_simple_packing_error, },
+{ "size", &grib_accessor_class_size, },
 { "smart_table", &grib_accessor_class_smart_table, },
-//{ "smart_table_column", &grib_accessor_class_smart_table_column, },
-//{ "spd", &grib_accessor_class_spd, },
-//{ "spectral_truncation", &grib_accessor_class_spectral_truncation, },
-//{ "sprintf", &grib_accessor_class_sprintf, },
-//{ "statistics", &grib_accessor_class_statistics, },
-//{ "statistics_spectral", &grib_accessor_class_statistics_spectral, },
-//{ "step_human_readable", &grib_accessor_class_step_human_readable, },
-//{ "step_in_units", &grib_accessor_class_step_in_units, },
-//{ "sum", &grib_accessor_class_sum, },
-//{ "suppressed", &grib_accessor_class_suppressed, },
-//{ "time", &grib_accessor_class_time, },
-//{ "to_double", &grib_accessor_class_to_double, },
-//{ "to_integer", &grib_accessor_class_to_integer, },
-//{ "to_string", &grib_accessor_class_to_string, },
+{ "smart_table_column", &grib_accessor_class_smart_table_column, },
+{ "spd", &grib_accessor_class_spd, },
+{ "spectral_truncation", &grib_accessor_class_spectral_truncation, },
+{ "sprintf", &grib_accessor_class_sprintf, },
+{ "statistics", &grib_accessor_class_statistics, },
+{ "statistics_spectral", &grib_accessor_class_statistics_spectral, },
+{ "step_human_readable", &grib_accessor_class_step_human_readable, },
+{ "step_in_units", &grib_accessor_class_step_in_units, },
+{ "sum", &grib_accessor_class_sum, },
+{ "suppressed", &grib_accessor_class_suppressed, },
+{ "time", &grib_accessor_class_time, },
+{ "to_double", &grib_accessor_class_to_double, },
+{ "to_integer", &grib_accessor_class_to_integer, },
+{ "to_string", &grib_accessor_class_to_string, },
 { "transient", &grib_accessor_class_transient, },
-//{ "transient_darray", &grib_accessor_class_transient_darray, },
-//{ "trim", &grib_accessor_class_trim, },
-//{ "uint16", &grib_accessor_class_uint16, },
-//{ "uint32", &grib_accessor_class_uint32, },
-//{ "uint32_little_endian", &grib_accessor_class_uint32_little_endian, },
-//{ "uint64", &grib_accessor_class_uint64, },
-//{ "uint64_little_endian", &grib_accessor_class_uint64_little_endian, },
-//{ "uint8", &grib_accessor_class_uint8, },
-//{ "unexpanded_descriptors", &grib_accessor_class_unexpanded_descriptors, },
-//{ "unpack_bufr_values", &grib_accessor_class_unpack_bufr_values, },
+{ "transient_darray", &grib_accessor_class_transient_darray, },
+{ "trim", &grib_accessor_class_trim, },
+{ "uint16", &grib_accessor_class_uint16, },
+{ "uint32", &grib_accessor_class_uint32, },
+{ "uint32_little_endian", &grib_accessor_class_uint32_little_endian, },
+{ "uint64", &grib_accessor_class_uint64, },
+{ "uint64_little_endian", &grib_accessor_class_uint64_little_endian, },
+{ "uint8", &grib_accessor_class_uint8, },
+{ "unexpanded_descriptors", &grib_accessor_class_unexpanded_descriptors, },
+{ "unpack_bufr_values", &grib_accessor_class_unpack_bufr_values, },
 { "unsigned", &grib_accessor_class_unsigned, },
-//{ "unsigned_bits", &grib_accessor_class_unsigned_bits, },
-//{ "validity_date", &grib_accessor_class_validity_date, },
-//{ "validity_time", &grib_accessor_class_validity_time, },
-//{ "values", &grib_accessor_class_values, },
+{ "unsigned_bits", &grib_accessor_class_unsigned_bits, },
+{ "validity_date", &grib_accessor_class_validity_date, },
+{ "validity_time", &grib_accessor_class_validity_time, },
+{ "values", &grib_accessor_class_values, },
 { "variable", &grib_accessor_class_variable, },
-//{ "vector", &grib_accessor_class_vector, },
-//{ "when", &grib_accessor_class_when, },
+{ "vector", &grib_accessor_class_vector, },
+{ "when", &grib_accessor_class_when, },
diff --git a/src/grib_accessor_factory_hash_list b/src/grib_accessor_factory_hash_list
index 136aedc43..1f7687f38 100644
--- a/src/grib_accessor_factory_hash_list
+++ b/src/grib_accessor_factory_hash_list
@@ -1,206 +1,206 @@
 /* This file is automatically generated by ./make_class.pl, do not edit */
  
-#abstract_long_vector, &grib_accessor_class_abstract_long_vector
-#abstract_vector, &grib_accessor_class_abstract_vector
-#ascii, &grib_accessor_class_ascii
-#bit, &grib_accessor_class_bit
-#bitmap, &grib_accessor_class_bitmap
-#bits, &grib_accessor_class_bits
-#bits_per_value, &grib_accessor_class_bits_per_value
-#blob, &grib_accessor_class_blob
-#budgdate, &grib_accessor_class_budgdate
-#bufr_data_array, &grib_accessor_class_bufr_data_array
-#bufr_data_element, &grib_accessor_class_bufr_data_element
-#bufr_elements_table, &grib_accessor_class_bufr_elements_table
-#bufr_extract_area_subsets, &grib_accessor_class_bufr_extract_area_subsets
-#bufr_extract_datetime_subsets, &grib_accessor_class_bufr_extract_datetime_subsets
-#bufr_extract_subsets, &grib_accessor_class_bufr_extract_subsets
-#bufr_group, &grib_accessor_class_bufr_group
-#bufr_simple_thinning, &grib_accessor_class_bufr_simple_thinning
-#bufr_string_values, &grib_accessor_class_bufr_string_values
-#bufrdc_expanded_descriptors, &grib_accessor_class_bufrdc_expanded_descriptors
-#bytes, &grib_accessor_class_bytes
-#change_alternative_row_scanning, &grib_accessor_class_change_alternative_row_scanning
-#change_scanning_direction, &grib_accessor_class_change_scanning_direction
-#check_internal_version, &grib_accessor_class_check_internal_version
-#closest_date, &grib_accessor_class_closest_date
-#codeflag, &grib_accessor_class_codeflag
+abstract_long_vector, &grib_accessor_class_abstract_long_vector
+abstract_vector, &grib_accessor_class_abstract_vector
+ascii, &grib_accessor_class_ascii
+bit, &grib_accessor_class_bit
+bitmap, &grib_accessor_class_bitmap
+bits, &grib_accessor_class_bits
+bits_per_value, &grib_accessor_class_bits_per_value
+blob, &grib_accessor_class_blob
+budgdate, &grib_accessor_class_budgdate
+bufr_data_array, &grib_accessor_class_bufr_data_array
+bufr_data_element, &grib_accessor_class_bufr_data_element
+bufr_elements_table, &grib_accessor_class_bufr_elements_table
+bufr_extract_area_subsets, &grib_accessor_class_bufr_extract_area_subsets
+bufr_extract_datetime_subsets, &grib_accessor_class_bufr_extract_datetime_subsets
+bufr_extract_subsets, &grib_accessor_class_bufr_extract_subsets
+bufr_group, &grib_accessor_class_bufr_group
+bufr_simple_thinning, &grib_accessor_class_bufr_simple_thinning
+bufr_string_values, &grib_accessor_class_bufr_string_values
+bufrdc_expanded_descriptors, &grib_accessor_class_bufrdc_expanded_descriptors
+bytes, &grib_accessor_class_bytes
+change_alternative_row_scanning, &grib_accessor_class_change_alternative_row_scanning
+change_scanning_direction, &grib_accessor_class_change_scanning_direction
+check_internal_version, &grib_accessor_class_check_internal_version
+closest_date, &grib_accessor_class_closest_date
+codeflag, &grib_accessor_class_codeflag
 codetable, &grib_accessor_class_codetable
-#codetable_title, &grib_accessor_class_codetable_title
-#codetable_units, &grib_accessor_class_codetable_units
-#concept, &grib_accessor_class_concept
+codetable_title, &grib_accessor_class_codetable_title
+codetable_units, &grib_accessor_class_codetable_units
+concept, &grib_accessor_class_concept
 constant, &grib_accessor_class_constant
-#count_file, &grib_accessor_class_count_file
-#count_missing, &grib_accessor_class_count_missing
-#count_total, &grib_accessor_class_count_total
-#data_apply_bitmap, &grib_accessor_class_data_apply_bitmap
-#data_apply_boustrophedonic, &grib_accessor_class_data_apply_boustrophedonic
-#data_apply_boustrophedonic_bitmap, &grib_accessor_class_data_apply_boustrophedonic_bitmap
-#data_ccsds_packing, &grib_accessor_class_data_ccsds_packing
-#data_complex_packing, &grib_accessor_class_data_complex_packing
-#data_dummy_field, &grib_accessor_class_data_dummy_field
-#data_g1complex_packing, &grib_accessor_class_data_g1complex_packing
-#data_g1second_order_constant_width_packing, &grib_accessor_class_data_g1second_order_constant_width_packing
-#data_g1second_order_general_extended_packing, &grib_accessor_class_data_g1second_order_general_extended_packing
-#data_g1second_order_general_packing, &grib_accessor_class_data_g1second_order_general_packing
-#data_g1second_order_row_by_row_packing, &grib_accessor_class_data_g1second_order_row_by_row_packing
-#data_g1secondary_bitmap, &grib_accessor_class_data_g1secondary_bitmap
-#data_g1shsimple_packing, &grib_accessor_class_data_g1shsimple_packing
-#data_g1simple_packing, &grib_accessor_class_data_g1simple_packing
-#data_g22order_packing, &grib_accessor_class_data_g22order_packing
-#data_g2bifourier_packing, &grib_accessor_class_data_g2bifourier_packing
-#data_g2complex_packing, &grib_accessor_class_data_g2complex_packing
-#data_g2secondary_bitmap, &grib_accessor_class_data_g2secondary_bitmap
-#data_g2shsimple_packing, &grib_accessor_class_data_g2shsimple_packing
-#data_g2simple_packing, &grib_accessor_class_data_g2simple_packing
-#data_g2simple_packing_with_preprocessing, &grib_accessor_class_data_g2simple_packing_with_preprocessing
-#data_jpeg2000_packing, &grib_accessor_class_data_jpeg2000_packing
-#data_png_packing, &grib_accessor_class_data_png_packing
-#data_raw_packing, &grib_accessor_class_data_raw_packing
-#data_run_length_packing, &grib_accessor_class_data_run_length_packing
-#data_secondary_bitmap, &grib_accessor_class_data_secondary_bitmap
-#data_sh_packed, &grib_accessor_class_data_sh_packed
-#data_sh_unpacked, &grib_accessor_class_data_sh_unpacked
-#data_shsimple_packing, &grib_accessor_class_data_shsimple_packing
-#data_simple_packing, &grib_accessor_class_data_simple_packing
-#decimal_precision, &grib_accessor_class_decimal_precision
-#dictionary, &grib_accessor_class_dictionary
-#dirty, &grib_accessor_class_dirty
-#divdouble, &grib_accessor_class_divdouble
-#double, &grib_accessor_class_double
-#element, &grib_accessor_class_element
-#evaluate, &grib_accessor_class_evaluate
-#expanded_descriptors, &grib_accessor_class_expanded_descriptors
-#from_scale_factor_scaled_value, &grib_accessor_class_from_scale_factor_scaled_value
-#g1_half_byte_codeflag, &grib_accessor_class_g1_half_byte_codeflag
-#g1_message_length, &grib_accessor_class_g1_message_length
-#g1_section4_length, &grib_accessor_class_g1_section4_length
-#g1bitmap, &grib_accessor_class_g1bitmap
-#g1date, &grib_accessor_class_g1date
-#g1day_of_the_year_date, &grib_accessor_class_g1day_of_the_year_date
-#g1end_of_interval_monthly, &grib_accessor_class_g1end_of_interval_monthly
-#g1fcperiod, &grib_accessor_class_g1fcperiod
-#g1forecastmonth, &grib_accessor_class_g1forecastmonth
-#g1monthlydate, &grib_accessor_class_g1monthlydate
-#g1number_of_coded_values_sh_complex, &grib_accessor_class_g1number_of_coded_values_sh_complex
-#g1number_of_coded_values_sh_simple, &grib_accessor_class_g1number_of_coded_values_sh_simple
-#g1step_range, &grib_accessor_class_g1step_range
-#g1verificationdate, &grib_accessor_class_g1verificationdate
-#g2_aerosol, &grib_accessor_class_g2_aerosol
-#g2_chemical, &grib_accessor_class_g2_chemical
-#g2_eps, &grib_accessor_class_g2_eps
-#g2_mars_labeling, &grib_accessor_class_g2_mars_labeling
-#g2bitmap, &grib_accessor_class_g2bitmap
-#g2bitmap_present, &grib_accessor_class_g2bitmap_present
-#g2date, &grib_accessor_class_g2date
-#g2end_step, &grib_accessor_class_g2end_step
-#g2grid, &grib_accessor_class_g2grid
-#g2latlon, &grib_accessor_class_g2latlon
-#g2level, &grib_accessor_class_g2level
-#g2lon, &grib_accessor_class_g2lon
-#g2step_range, &grib_accessor_class_g2step_range
-#gaussian_grid_name, &grib_accessor_class_gaussian_grid_name
-#gds_is_present, &grib_accessor_class_gds_is_present
-#gds_not_present_bitmap, &grib_accessor_class_gds_not_present_bitmap
-#gen, &grib_accessor_class_gen
-#getenv, &grib_accessor_class_getenv
-#global_gaussian, &grib_accessor_class_global_gaussian
-#group, &grib_accessor_class_group
-#gts_header, &grib_accessor_class_gts_header
-#hash_array, &grib_accessor_class_hash_array
-#headers_only, &grib_accessor_class_headers_only
-#ibmfloat, &grib_accessor_class_ibmfloat
-#ieeefloat, &grib_accessor_class_ieeefloat
-#ifs_param, &grib_accessor_class_ifs_param
+count_file, &grib_accessor_class_count_file
+count_missing, &grib_accessor_class_count_missing
+count_total, &grib_accessor_class_count_total
+data_apply_bitmap, &grib_accessor_class_data_apply_bitmap
+data_apply_boustrophedonic, &grib_accessor_class_data_apply_boustrophedonic
+data_apply_boustrophedonic_bitmap, &grib_accessor_class_data_apply_boustrophedonic_bitmap
+data_ccsds_packing, &grib_accessor_class_data_ccsds_packing
+data_complex_packing, &grib_accessor_class_data_complex_packing
+data_dummy_field, &grib_accessor_class_data_dummy_field
+data_g1complex_packing, &grib_accessor_class_data_g1complex_packing
+data_g1second_order_constant_width_packing, &grib_accessor_class_data_g1second_order_constant_width_packing
+data_g1second_order_general_extended_packing, &grib_accessor_class_data_g1second_order_general_extended_packing
+data_g1second_order_general_packing, &grib_accessor_class_data_g1second_order_general_packing
+data_g1second_order_row_by_row_packing, &grib_accessor_class_data_g1second_order_row_by_row_packing
+data_g1secondary_bitmap, &grib_accessor_class_data_g1secondary_bitmap
+data_g1shsimple_packing, &grib_accessor_class_data_g1shsimple_packing
+data_g1simple_packing, &grib_accessor_class_data_g1simple_packing
+data_g22order_packing, &grib_accessor_class_data_g22order_packing
+data_g2bifourier_packing, &grib_accessor_class_data_g2bifourier_packing
+data_g2complex_packing, &grib_accessor_class_data_g2complex_packing
+data_g2secondary_bitmap, &grib_accessor_class_data_g2secondary_bitmap
+data_g2shsimple_packing, &grib_accessor_class_data_g2shsimple_packing
+data_g2simple_packing, &grib_accessor_class_data_g2simple_packing
+data_g2simple_packing_with_preprocessing, &grib_accessor_class_data_g2simple_packing_with_preprocessing
+data_jpeg2000_packing, &grib_accessor_class_data_jpeg2000_packing
+data_png_packing, &grib_accessor_class_data_png_packing
+data_raw_packing, &grib_accessor_class_data_raw_packing
+data_run_length_packing, &grib_accessor_class_data_run_length_packing
+data_secondary_bitmap, &grib_accessor_class_data_secondary_bitmap
+data_sh_packed, &grib_accessor_class_data_sh_packed
+data_sh_unpacked, &grib_accessor_class_data_sh_unpacked
+data_shsimple_packing, &grib_accessor_class_data_shsimple_packing
+data_simple_packing, &grib_accessor_class_data_simple_packing
+decimal_precision, &grib_accessor_class_decimal_precision
+dictionary, &grib_accessor_class_dictionary
+dirty, &grib_accessor_class_dirty
+divdouble, &grib_accessor_class_divdouble
+double, &grib_accessor_class_double
+element, &grib_accessor_class_element
+evaluate, &grib_accessor_class_evaluate
+expanded_descriptors, &grib_accessor_class_expanded_descriptors
+from_scale_factor_scaled_value, &grib_accessor_class_from_scale_factor_scaled_value
+g1_half_byte_codeflag, &grib_accessor_class_g1_half_byte_codeflag
+g1_message_length, &grib_accessor_class_g1_message_length
+g1_section4_length, &grib_accessor_class_g1_section4_length
+g1bitmap, &grib_accessor_class_g1bitmap
+g1date, &grib_accessor_class_g1date
+g1day_of_the_year_date, &grib_accessor_class_g1day_of_the_year_date
+g1end_of_interval_monthly, &grib_accessor_class_g1end_of_interval_monthly
+g1fcperiod, &grib_accessor_class_g1fcperiod
+g1forecastmonth, &grib_accessor_class_g1forecastmonth
+g1monthlydate, &grib_accessor_class_g1monthlydate
+g1number_of_coded_values_sh_complex, &grib_accessor_class_g1number_of_coded_values_sh_complex
+g1number_of_coded_values_sh_simple, &grib_accessor_class_g1number_of_coded_values_sh_simple
+g1step_range, &grib_accessor_class_g1step_range
+g1verificationdate, &grib_accessor_class_g1verificationdate
+g2_aerosol, &grib_accessor_class_g2_aerosol
+g2_chemical, &grib_accessor_class_g2_chemical
+g2_eps, &grib_accessor_class_g2_eps
+g2_mars_labeling, &grib_accessor_class_g2_mars_labeling
+g2bitmap, &grib_accessor_class_g2bitmap
+g2bitmap_present, &grib_accessor_class_g2bitmap_present
+g2date, &grib_accessor_class_g2date
+g2end_step, &grib_accessor_class_g2end_step
+g2grid, &grib_accessor_class_g2grid
+g2latlon, &grib_accessor_class_g2latlon
+g2level, &grib_accessor_class_g2level
+g2lon, &grib_accessor_class_g2lon
+g2step_range, &grib_accessor_class_g2step_range
+gaussian_grid_name, &grib_accessor_class_gaussian_grid_name
+gds_is_present, &grib_accessor_class_gds_is_present
+gds_not_present_bitmap, &grib_accessor_class_gds_not_present_bitmap
+gen, &grib_accessor_class_gen
+getenv, &grib_accessor_class_getenv
+global_gaussian, &grib_accessor_class_global_gaussian
+group, &grib_accessor_class_group
+gts_header, &grib_accessor_class_gts_header
+hash_array, &grib_accessor_class_hash_array
+headers_only, &grib_accessor_class_headers_only
+ibmfloat, &grib_accessor_class_ibmfloat
+ieeefloat, &grib_accessor_class_ieeefloat
+ifs_param, &grib_accessor_class_ifs_param
 iterator, &grib_accessor_class_iterator
-#julian_date, &grib_accessor_class_julian_date
-#julian_day, &grib_accessor_class_julian_day
-#ksec1expver, &grib_accessor_class_ksec1expver
-#label, &grib_accessor_class_label
-#latitudes, &grib_accessor_class_latitudes
-#latlon_increment, &grib_accessor_class_latlon_increment
-#latlonvalues, &grib_accessor_class_latlonvalues
-#library_version, &grib_accessor_class_library_version
-#local_definition, &grib_accessor_class_local_definition
+julian_date, &grib_accessor_class_julian_date
+julian_day, &grib_accessor_class_julian_day
+ksec1expver, &grib_accessor_class_ksec1expver
+label, &grib_accessor_class_label
+latitudes, &grib_accessor_class_latitudes
+latlon_increment, &grib_accessor_class_latlon_increment
+latlonvalues, &grib_accessor_class_latlonvalues
+library_version, &grib_accessor_class_library_version
+local_definition, &grib_accessor_class_local_definition
 long, &grib_accessor_class_long
-#long_vector, &grib_accessor_class_long_vector
-#longitudes, &grib_accessor_class_longitudes
-#lookup, &grib_accessor_class_lookup
-#mars_param, &grib_accessor_class_mars_param
-#mars_step, &grib_accessor_class_mars_step
-#md5, &grib_accessor_class_md5
-#message, &grib_accessor_class_message
-#message_copy, &grib_accessor_class_message_copy
-#multdouble, &grib_accessor_class_multdouble
+long_vector, &grib_accessor_class_long_vector
+longitudes, &grib_accessor_class_longitudes
+lookup, &grib_accessor_class_lookup
+mars_param, &grib_accessor_class_mars_param
+mars_step, &grib_accessor_class_mars_step
+md5, &grib_accessor_class_md5
+message, &grib_accessor_class_message
+message_copy, &grib_accessor_class_message_copy
+multdouble, &grib_accessor_class_multdouble
 nearest, &grib_accessor_class_nearest
-#non_alpha, &grib_accessor_class_non_alpha
-#number_of_coded_values, &grib_accessor_class_number_of_coded_values
-#number_of_points, &grib_accessor_class_number_of_points
-#number_of_points_gaussian, &grib_accessor_class_number_of_points_gaussian
-#number_of_values, &grib_accessor_class_number_of_values
-#number_of_values_data_raw_packing, &grib_accessor_class_number_of_values_data_raw_packing
-#octahedral_gaussian, &grib_accessor_class_octahedral_gaussian
-#octet_number, &grib_accessor_class_octet_number
-#offset_file, &grib_accessor_class_offset_file
-#offset_values, &grib_accessor_class_offset_values
-#optimal_step_units, &grib_accessor_class_optimal_step_units
-#pack_bufr_values, &grib_accessor_class_pack_bufr_values
-#packing_type, &grib_accessor_class_packing_type
-#pad, &grib_accessor_class_pad
-#padding, &grib_accessor_class_padding
-#padto, &grib_accessor_class_padto
-#padtoeven, &grib_accessor_class_padtoeven
-#padtomultiple, &grib_accessor_class_padtomultiple
-#position, &grib_accessor_class_position
-#proj_string, &grib_accessor_class_proj_string
-#raw, &grib_accessor_class_raw
-#rdbtime_guess_date, &grib_accessor_class_rdbtime_guess_date
-#reference_value_error, &grib_accessor_class_reference_value_error
-#round, &grib_accessor_class_round
-#scale, &grib_accessor_class_scale
-#scale_values, &grib_accessor_class_scale_values
-#second_order_bits_per_value, &grib_accessor_class_second_order_bits_per_value
-#section, &grib_accessor_class_section
-#section_length, &grib_accessor_class_section_length
-#section_padding, &grib_accessor_class_section_padding
-#section_pointer, &grib_accessor_class_section_pointer
-#select_step_template, &grib_accessor_class_select_step_template
-#sexagesimal2decimal, &grib_accessor_class_sexagesimal2decimal
-#signed, &grib_accessor_class_signed
-#signed_bits, &grib_accessor_class_signed_bits
-#simple_packing_error, &grib_accessor_class_simple_packing_error
-#size, &grib_accessor_class_size
+non_alpha, &grib_accessor_class_non_alpha
+number_of_coded_values, &grib_accessor_class_number_of_coded_values
+number_of_points, &grib_accessor_class_number_of_points
+number_of_points_gaussian, &grib_accessor_class_number_of_points_gaussian
+number_of_values, &grib_accessor_class_number_of_values
+number_of_values_data_raw_packing, &grib_accessor_class_number_of_values_data_raw_packing
+octahedral_gaussian, &grib_accessor_class_octahedral_gaussian
+octet_number, &grib_accessor_class_octet_number
+offset_file, &grib_accessor_class_offset_file
+offset_values, &grib_accessor_class_offset_values
+optimal_step_units, &grib_accessor_class_optimal_step_units
+pack_bufr_values, &grib_accessor_class_pack_bufr_values
+packing_type, &grib_accessor_class_packing_type
+pad, &grib_accessor_class_pad
+padding, &grib_accessor_class_padding
+padto, &grib_accessor_class_padto
+padtoeven, &grib_accessor_class_padtoeven
+padtomultiple, &grib_accessor_class_padtomultiple
+position, &grib_accessor_class_position
+proj_string, &grib_accessor_class_proj_string
+raw, &grib_accessor_class_raw
+rdbtime_guess_date, &grib_accessor_class_rdbtime_guess_date
+reference_value_error, &grib_accessor_class_reference_value_error
+round, &grib_accessor_class_round
+scale, &grib_accessor_class_scale
+scale_values, &grib_accessor_class_scale_values
+second_order_bits_per_value, &grib_accessor_class_second_order_bits_per_value
+section, &grib_accessor_class_section
+section_length, &grib_accessor_class_section_length
+section_padding, &grib_accessor_class_section_padding
+section_pointer, &grib_accessor_class_section_pointer
+select_step_template, &grib_accessor_class_select_step_template
+sexagesimal2decimal, &grib_accessor_class_sexagesimal2decimal
+signed, &grib_accessor_class_signed
+signed_bits, &grib_accessor_class_signed_bits
+simple_packing_error, &grib_accessor_class_simple_packing_error
+size, &grib_accessor_class_size
 smart_table, &grib_accessor_class_smart_table
-#smart_table_column, &grib_accessor_class_smart_table_column
-#spd, &grib_accessor_class_spd
-#spectral_truncation, &grib_accessor_class_spectral_truncation
-#sprintf, &grib_accessor_class_sprintf
-#statistics, &grib_accessor_class_statistics
-#statistics_spectral, &grib_accessor_class_statistics_spectral
-#step_human_readable, &grib_accessor_class_step_human_readable
-#step_in_units, &grib_accessor_class_step_in_units
-#sum, &grib_accessor_class_sum
-#suppressed, &grib_accessor_class_suppressed
-#time, &grib_accessor_class_time
-#to_double, &grib_accessor_class_to_double
-#to_integer, &grib_accessor_class_to_integer
-#to_string, &grib_accessor_class_to_string
+smart_table_column, &grib_accessor_class_smart_table_column
+spd, &grib_accessor_class_spd
+spectral_truncation, &grib_accessor_class_spectral_truncation
+sprintf, &grib_accessor_class_sprintf
+statistics, &grib_accessor_class_statistics
+statistics_spectral, &grib_accessor_class_statistics_spectral
+step_human_readable, &grib_accessor_class_step_human_readable
+step_in_units, &grib_accessor_class_step_in_units
+sum, &grib_accessor_class_sum
+suppressed, &grib_accessor_class_suppressed
+time, &grib_accessor_class_time
+to_double, &grib_accessor_class_to_double
+to_integer, &grib_accessor_class_to_integer
+to_string, &grib_accessor_class_to_string
 transient, &grib_accessor_class_transient
-#transient_darray, &grib_accessor_class_transient_darray
-#trim, &grib_accessor_class_trim
-#uint16, &grib_accessor_class_uint16
-#uint32, &grib_accessor_class_uint32
-#uint32_little_endian, &grib_accessor_class_uint32_little_endian
-#uint64, &grib_accessor_class_uint64
-#uint64_little_endian, &grib_accessor_class_uint64_little_endian
-#uint8, &grib_accessor_class_uint8
-#unexpanded_descriptors, &grib_accessor_class_unexpanded_descriptors
-#unpack_bufr_values, &grib_accessor_class_unpack_bufr_values
+transient_darray, &grib_accessor_class_transient_darray
+trim, &grib_accessor_class_trim
+uint16, &grib_accessor_class_uint16
+uint32, &grib_accessor_class_uint32
+uint32_little_endian, &grib_accessor_class_uint32_little_endian
+uint64, &grib_accessor_class_uint64
+uint64_little_endian, &grib_accessor_class_uint64_little_endian
+uint8, &grib_accessor_class_uint8
+unexpanded_descriptors, &grib_accessor_class_unexpanded_descriptors
+unpack_bufr_values, &grib_accessor_class_unpack_bufr_values
 unsigned, &grib_accessor_class_unsigned
-#unsigned_bits, &grib_accessor_class_unsigned_bits
-#validity_date, &grib_accessor_class_validity_date
-#validity_time, &grib_accessor_class_validity_time
-#values, &grib_accessor_class_values
+unsigned_bits, &grib_accessor_class_unsigned_bits
+validity_date, &grib_accessor_class_validity_date
+validity_time, &grib_accessor_class_validity_time
+values, &grib_accessor_class_values
 variable, &grib_accessor_class_variable
-#vector, &grib_accessor_class_vector
-#when, &grib_accessor_class_when
+vector, &grib_accessor_class_vector
+when, &grib_accessor_class_when
diff --git a/src/shared_functions.cc b/src/shared_functions.cc
new file mode 100644
index 000000000..fc6f090fb
--- /dev/null
+++ b/src/shared_functions.cc
@@ -0,0 +1,47 @@
+#include "shared_functions.h"
+
+
+/* Table of multipliers to convert step units to minutes */
+static const double u2m[] = {
+    1,            /* index 0:  minutes  */
+    60,           /* index 1:  hour     */
+    24 * 60,      /* index 2:  day      */
+    24 * 60 * 30, /* index 3:  month    */
+    -1,           /* index 4:  year     */
+    -1,           /* index 5:  decade   */
+    -1,           /* index 6:  30 years */
+    -1,           /* index 7:  century  */
+    -1,           /* index 8:  RESERVED */
+    -1,           /* index 9:  RESERVED */
+    3 * 60,       /* index 10: 3 hours  */
+    6 * 60,       /* index 11: 6 hours  */
+    12 * 60,      /* index 12: 12 hours */
+    1 / 60.0,     /* index 13: seconds  */
+    15,           /* index 14: 15 mins  */
+    30            /* index 15: 30 mins  */
+};
+
+
+void grib_set_bit_on(unsigned char* p, long* bitp){
+    unsigned char o = 1;
+    p += (*bitp >> 3);
+    o <<= 7 - ((*bitp) % 8);
+    *p |= o;
+    (*bitp) += 1;
+}
+
+long convert_to_minutes(long step, long stepUnits)
+{
+    double result = 0;
+    if (stepUnits == 0)
+        return step; /* unit=minutes so no change */
+    if (stepUnits == 1)
+        return step * 60; /* unit=hours */
+    if (stepUnits == 13)
+        return step / 60; /* unit=seconds */
+    /* Assert( stepUnits < sizeof(u2m)/sizeof(u2m[0]) ); */
+
+    result = step * u2m[stepUnits];
+    return (long)result;
+}
+
diff --git a/src/shared_functions.h b/src/shared_functions.h
new file mode 100644
index 000000000..04ae2f90f
--- /dev/null
+++ b/src/shared_functions.h
@@ -0,0 +1,9 @@
+#ifndef eccodes_shared_functions_h
+#define eccodes_shared_functions_h
+
+#include "grib_api_internal.h"
+
+void grib_set_bit_on(unsigned char*, long*);
+long convert_to_minutes(long step, long stepUnits);
+
+#endif // eccodes_shared_functions_h