Finished 2.6.x API's