More changes to introduce other APIs