move InstrumentType to fields