Use new API lang and adapt loader