Add handling for some undocumented instruments
Remove Sampler class