Added additional targets. Vibration analysis is untested on these.