Aligning with changes in lib. Moving other APIs out