Refactoring for Instrument, removed TagMap from interface