Updates to the 2.68 API EXPERIMENTAL