Removing TagMap from Instrument interface