Add multi-instrument support