Updated for 0.3z R2; Multi-Version support