Added decorators to extended InstrumentDevice and PlatformDevice