More work on InstrManagerPlugin