Instrument class conversion for #16