Modified InstrumentService Implementation