Refactored Instrument Service