Per instrument detector classes added.